[shotwell] fullscreen: Hide toolbar if disabled in settings
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell] fullscreen: Hide toolbar if disabled in settings
- Date: Fri, 23 Jun 2017 21:55:57 +0000 (UTC)
commit 594a2a590d2387a7a384a3124dff189f3e745c4e
Author: Jens Georg <mail jensge org>
Date: Fri Jun 23 23:54:26 2017 +0200
fullscreen: Hide toolbar if disabled in settings
If the toolbar is disabled in settings, also start with it hidden in
fullscreen, unless it was pinned
https://bugzilla.gnome.org/show_bug.cgi?id=741962
src/AppWindow.vala | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/src/AppWindow.vala b/src/AppWindow.vala
index a63c319..96225b2 100644
--- a/src/AppWindow.vala
+++ b/src/AppWindow.vala
@@ -89,8 +89,15 @@ public class FullscreenWindow : PageWindow {
// capture motion events to show the toolbar
add_events(Gdk.EventMask.POINTER_MOTION_MASK);
- // start off with toolbar invoked, as a clue for the user
- invoke_toolbar();
+ // If toolbar is enabled in "normal" ui OR was pinned in
+ // fullscreen, start off with toolbar invoked, as a clue for the
+ // user. Otherwise leave hidden unless activated by mouse over
+ if (Config.Facade.get_instance().get_display_toolbar() ||
+ !Config.Facade.get_instance().get_pin_toolbar_state()) {
+ invoke_toolbar();
+ } else {
+ hide_toolbar();
+ }
// Toolbar steals keyboard focus from page, put it back again
page.grab_focus ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]