diff options
author | Matt Watson <mattdangerw@gmail.com> | 2016-04-18 17:02:18 -0700 |
---|---|---|
committer | Philip Chimento <philip@endlessm.com> | 2016-04-21 15:19:08 -0700 |
commit | 6312c7eb76f4a3b7222a63ee2b7a7f848846f3ff (patch) | |
tree | f3745349d5c283ff7c36a27c64b6f78619d1c524 /data/widgets/topbar.ui | |
parent | 065e06c6110b191d5a13aa3d8598fc9feac03a46 (diff) |
topbar: redo credit button show/hide
We had a stack and listened to enter leave to trigger a transition,
but that broke when GtkStack ditched its main GdkWindow with the
upgrade to 3.20.
Switch to doing this all with a regular button in css, cause that's
simpler
https://phabricator.endlessm.com/T11000
Diffstat (limited to 'data/widgets/topbar.ui')
-rw-r--r-- | data/widgets/topbar.ui | 41 |
1 files changed, 12 insertions, 29 deletions
diff --git a/data/widgets/topbar.ui b/data/widgets/topbar.ui index 1731e7f..e371d9b 100644 --- a/data/widgets/topbar.ui +++ b/data/widgets/topbar.ui @@ -10,41 +10,24 @@ <property name="show_close_button">True</property> <property name="spacing">8</property> <child> - <object class="GtkStack" id="credits_stack"> - <property name="visible">True</property> + <object class="GtkButton" id="credits_button"> + <property name="visible">False</property> + <property name="no-show-all">True</property> <property name="can_focus">False</property> - <property name="transition_type">crossfade</property> - <property name="events">GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK</property> + <property name="halign">end</property> + <property name="valign">center</property> + <signal name="clicked" handler="on_credits_clicked"/> <child> - <object class="GtkEventBox" id="blank"> + <object class="GtkImage" id="credits_image"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="icon_name">user-info-symbolic</property> + <property name="pixel_size">16</property> </object> - <packing> - <property name="name">blank</property> - </packing> - </child> - <child> - <object class="GtkButton" id="credits_button"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="valign">center</property> - <signal name="clicked" handler="on_credits_clicked"/> - <child> - <object class="GtkImage" id="credits_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">user-info-symbolic</property> - <property name="pixel_size">16</property> - </object> - </child> - </object> - <packing> - <property name="name">button</property> - <property name="position">1</property> - </packing> </child> + <style> + <class name="credits-button"/> + </style> </object> <packing> <property name="pack_type">end</property> |