diff options
| author | Tristan Van Berkom <tristan@upstairslabs.com> | 2014-11-21 14:41:18 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan@upstairslabs.com> | 2014-11-21 14:42:55 +0900 |
| commit | 9a2d04537d03413a521f94b7405fffcb45e74cec (patch) | |
| tree | 9edd2de0a45348f0c23658261495738846c2c653 | |
| parent | e08dace13bc73b8abf948d88cda88f88f76f7401 (diff) | |
| download | glade-stack.tar.gz | |
fixupstack
| -rw-r--r-- | plugins/gtk+/glade-scrolled-window-editor.ui | 17 | ||||
| -rw-r--r-- | plugins/gtk+/gtk+.xml.in | 4 |
2 files changed, 6 insertions, 15 deletions
diff --git a/plugins/gtk+/glade-scrolled-window-editor.ui b/plugins/gtk+/glade-scrolled-window-editor.ui index 0242a5d1..04ce53e0 100644 --- a/plugins/gtk+/glade-scrolled-window-editor.ui +++ b/plugins/gtk+/glade-scrolled-window-editor.ui @@ -322,27 +322,17 @@ Author: Tristan Van Berkom <tvb@gnome.org> </packing> </child> <child> - <object class="GladePropertyLabel" id="overlay_scrolling_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">False</property> - <property name="property_name">overlay-scrolling</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> <object class="GladePropertyShell" id="overlay_scrolling_editor"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">False</property> <property name="property_name">overlay-scrolling</property> + <property name="editor_type">GladeEpropCheck</property> </object> <packing> - <property name="left_attach">4</property> + <property name="left_attach">3</property> <property name="top_attach">4</property> + <property name="width">2</property> </packing> </child> <child> @@ -398,7 +388,6 @@ Author: Tristan Van Berkom <tvb@gnome.org> <editor id="vadj_label"/> <editor id="hadj_editor"/> <editor id="vadj_editor"/> - <editor id="overlay_scrolling_label"/> <editor id="overlay_scrolling_editor"/> </child-editors> </template> diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in index 51e66e03..ff4905f3 100644 --- a/plugins/gtk+/gtk+.xml.in +++ b/plugins/gtk+/gtk+.xml.in @@ -3076,7 +3076,9 @@ <value id="GTK_CORNER_BOTTOM_RIGHT" _name="Bottom Right"/> </displayable-values> </property> - <property id="overlay-scrolling" optional="True" optional-default="False" since="3.16" custom-layout="True"/> + <property id="overlay-scrolling" since="3.16" custom-layout="True"> + <_tooltip>If overlay scrolling is enabled, scrollbars are only added as traditional widgets when a mouse is present</_tooltip> + </property> </properties> <signals> |