dany/clapper
1
0
Fork 0
mirror of https://github.com/Rafostar/clapper.git synced 2025-08-30 07:42:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Separate top revealer title and time

Browse Source
This commit is contained in:
Rafał Dzięgiel
2021-02-22 10:03:17 +01:00
committed by Rafał Dzięgiel
parent 8b254de151
commit 61ae543cf9
3 changed files with 64 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/revealers.js
View File

@@ -58,23 +58,26 @@ class ClapperRevealerTop extends CustomRevealer
ellipsize: Pango.EllipsizeMode.END,
halign: Gtk.Align.START,
valign: Gtk.Align.CENTER,
hexpand: true,
margin_start: 10,
margin_end: 10,
visible: false,
});
this.mediaTitle.add_css_class('tvtitle');
this.currentTime = new Gtk.Label({
halign: Gtk.Align.END,
valign: Gtk.Align.CENTER,
margin_start: 24,
margin_start: 10,
margin_end: 10,
});
this.currentTime.add_css_class('tvtime');
this.endTime = new Gtk.Label({
halign: Gtk.Align.END,
valign: Gtk.Align.START,
margin_start: 10,
margin_end: 10,
margin_bottom: 2,
visible: false,
});
this.endTime.add_css_class('tvendtime');
@@ -85,30 +88,38 @@ class ClapperRevealerTop extends CustomRevealer
revealerBox.append(this.headerBar);
this.revealerGrid = new Gtk.Grid({
visible: false,
column_spacing: 4,
margin_top: 8,
margin_start: 8,
margin_end: 8,
visible: false,
});
this.revealerGrid.add_css_class('revealertopgrid');
const topBox = new Gtk.Box({
const topLeftBox = new Gtk.Box({
orientation: Gtk.Orientation.HORIZONTAL,
});
topBox.add_css_class('osd');
topBox.add_css_class('tvrevealerboxtop');
topBox.append(this.mediaTitle);
topBox.append(this.currentTime);
topLeftBox.add_css_class('osd');
topLeftBox.add_css_class('roundedcorners');
topLeftBox.append(this.mediaTitle);
const bottomBox = new Gtk.Box({
const topSpacerBox = new Gtk.Box({
orientation: Gtk.Orientation.HORIZONTAL,
hexpand: true,
});
const topRightBox = new Gtk.Box({
orientation: Gtk.Orientation.VERTICAL,
halign: Gtk.Align.END,
});
bottomBox.add_css_class('osd');
bottomBox.add_css_class('tvrevealerboxbottom');
bottomBox.append(this.endTime);
topRightBox.add_css_class('osd');
topRightBox.add_css_class('roundedcorners');
topRightBox.append(this.currentTime);
topRightBox.append(this.endTime);
this.revealerGrid.attach(topBox, 0, 0, 2, 1);
this.revealerGrid.attach(bottomBox, 1, 1, 1, 1);
this.revealerGrid.attach(topLeftBox, 0, 0, 1, 1);
this.revealerGrid.attach(topSpacerBox, 1, 0, 1, 1);
this.revealerGrid.attach(topRightBox, 2, 0, 1, 2);
revealerBox.append(this.revealerGrid);
this.set_child(revealerBox);
@@ -124,6 +135,16 @@ class ClapperRevealerTop extends CustomRevealer
return this.mediaTitle.label;
}
set showTitle(isShow)
{
this.mediaTitle.visible = isShow;
}
get showTitle()
{
return this.mediaTitle.visible;
}
setTimes(currTime, endTime)
{
const now = currTime.format(this.timeFormat);
@@ -140,6 +161,20 @@ class ClapperRevealerTop extends CustomRevealer
return nextUpdate;
}
setFullscreenMode(isFullscreen, isMobileMonitor)
{
const isTvMode = (isFullscreen && !isMobileMonitor);
this.headerBar.visible = !isTvMode;
this.revealerGrid.visible = isTvMode;
this.headerBar.extraButtonsBox.visible = !isFullscreen;
this.transition_type = (isTvMode)
? Gtk.RevealerTransitionType.SLIDE_DOWN
: Gtk.RevealerTransitionType.CROSSFADE;
}
});
var RevealerBottom = GObject.registerClass(
@@ -160,7 +195,7 @@ class ClapperRevealerBottom extends CustomRevealer
margin_bottom: 8,
});
this.revealerBox.add_css_class('osd');
this.revealerBox.add_css_class('revealerbottombox');
this.revealerBox.add_css_class('roundedcorners');
this.set_child(this.revealerBox);

8
src/widget.js
View File

@@ -152,12 +152,7 @@ class ClapperWidget extends Gtk.Grid
this._changeControlsPlacement(isFullscreen);
this.controls.setFullscreenMode(isFullscreen);
const headerbar = this.revealerTop.headerBar;
headerbar.visible = (!isFullscreen || this.isMobileMonitor);
headerbar.extraButtonsBox.visible = !isFullscreen;
this.revealerTop.revealerGrid.visible = !headerbar.visible;
this.revealerTop.setFullscreenMode(isFullscreen, this.isMobileMonitor);
if(this.revealerTop.child_revealed)
this._checkSetUpdateTimeInterval();
@@ -328,6 +323,7 @@ class ClapperWidget extends Gtk.Grid
this.root.title = title;
this.revealerTop.title = title;
this.revealerTop.showTitle = true;
}
updateTime()