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

Fix GUI look when video track is disabled

Browse Source
This commit is contained in:
Rafostar
2020-09-14 22:25:42 +02:00
parent 234c49221e
commit 779796c2c3
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
clapper_src/interface.js
View File

@@ -26,19 +26,22 @@ class ClapperInterface extends Gtk.Grid
this.headerBar = null; this.headerBar = null;
this.defaultTitle = null; this.defaultTitle = null;
this.videoBox = new Gtk.Box();
this.overlay = new Gtk.Overlay(); this.overlay = new Gtk.Overlay();
this.controls = new Controls();
this.revealer = new Gtk.Revealer({ this.revealer = new Gtk.Revealer({
transition_duration: this.revealTime, transition_duration: this.revealTime,
transition_type: Gtk.RevealerTransitionType.SLIDE_UP, transition_type: Gtk.RevealerTransitionType.SLIDE_UP,
valign: Gtk.Align.END, valign: Gtk.Align.END,
}); });
this.revealerBox = new Gtk.Box(); this.revealerBox = new Gtk.Box();
let revealerContext = this.revealerBox.get_style_context(); this.controls = new Controls();
revealerContext.add_class('osd');
this.videoBox.get_style_context().add_class('videobox');
this.revealerBox.get_style_context().add_class('osd');
this.videoBox.pack_start(this.overlay, true, true, 0);
this.revealer.add(this.revealerBox); this.revealer.add(this.revealerBox);
this.attach(this.overlay, 0, 0, 1, 1); this.attach(this.videoBox, 0, 0, 1, 1);
this.attach(this.controls, 0, 1, 1, 1); this.attach(this.controls, 0, 1, 1, 1);
} }
@@ -307,9 +310,9 @@ class ClapperInterface extends Gtk.Grid
if(activeId < 0) { if(activeId < 0) {
// disabling video leaves last frame frozen, // disabling video leaves last frame frozen,
// so we also hide the widget // so we hide it by making it transparent
if(type === 'video') if(type === 'video')
this._player.widget.hide(); this._player.widget.set_opacity(0);
return this._player[`set_${type}_track_enabled`](false); return this._player[`set_${type}_track_enabled`](false);
} }
@@ -317,8 +320,8 @@ class ClapperInterface extends Gtk.Grid
this._player[`set_${type}_track`](activeId); this._player[`set_${type}_track`](activeId);
this._player[`set_${type}_track_enabled`](true); this._player[`set_${type}_track_enabled`](true);
if(type === 'video' && !this._player.widget.get_visible()) { if(type === 'video' && !this._player.widget.opacity) {
this._player.widget.show(); this._player.widget.set_opacity(1);
this._player.renderer.expose(); this._player.renderer.expose();
} }
} }

3
css/styles.css
View File

@@ -21,6 +21,9 @@ scale marks {
min-width: 18px; min-width: 18px;
min-height: 18px; min-height: 18px;
} }
.videobox {
background: black;
}
/* Position Scale */ /* Position Scale */
.positionscale value { .positionscale value {