Fix startup error (undefined variable) on non-composited displays.
Fix titlebar label preventing scaling down titlebars by wrapping whole box in a viewport. Add vertical scrollbars to the Profiles and Layouts tabs in Preferences.
This commit is contained in:
commit
5bdbc1ce20
|
@ -43,7 +43,7 @@ class EditableLabel(Gtk.EventBox):
|
||||||
GObject.GObject.__init__(self)
|
GObject.GObject.__init__(self)
|
||||||
|
|
||||||
self._entry_handler_id = []
|
self._entry_handler_id = []
|
||||||
self._label = Gtk.Label(label=text)
|
self._label = Gtk.Label(label=text, ellipsize='end')
|
||||||
self._custom = False
|
self._custom = False
|
||||||
self.set_visible_window (False)
|
self.set_visible_window (False)
|
||||||
self.add (self._label)
|
self.add (self._label)
|
||||||
|
|
|
@ -1208,6 +1208,10 @@
|
||||||
<object class="GtkVBox" id="vbox1">
|
<object class="GtkVBox" id="vbox1">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can_focus">False</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkScrolledWindow" id="scrolledwindow3">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="hscrollbar_policy">never</property>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkTreeView" id="profilelist">
|
<object class="GtkTreeView" id="profilelist">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
|
@ -1233,6 +1237,8 @@
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">True</property>
|
<property name="expand">True</property>
|
||||||
<property name="fill">True</property>
|
<property name="fill">True</property>
|
||||||
|
@ -3143,6 +3149,10 @@
|
||||||
<object class="GtkVBox" id="vbox2">
|
<object class="GtkVBox" id="vbox2">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can_focus">False</property>
|
||||||
|
<child>
|
||||||
|
<object class="GtkScrolledWindow" id="scrolledwindow4">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="hscrollbar_policy">never</property>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkTreeView" id="layoutlist">
|
<object class="GtkTreeView" id="layoutlist">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
|
@ -3167,6 +3177,8 @@
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">True</property>
|
<property name="expand">True</property>
|
||||||
<property name="fill">True</property>
|
<property name="fill">True</property>
|
||||||
|
|
|
@ -50,7 +50,7 @@ class Titlebar(Gtk.EventBox):
|
||||||
self.label.connect('edit-done', self.on_edit_done)
|
self.label.connect('edit-done', self.on_edit_done)
|
||||||
self.ebox = Gtk.EventBox()
|
self.ebox = Gtk.EventBox()
|
||||||
grouphbox = Gtk.HBox()
|
grouphbox = Gtk.HBox()
|
||||||
self.grouplabel = Gtk.Label()
|
self.grouplabel = Gtk.Label(ellipsize='end')
|
||||||
self.groupicon = Gtk.Image()
|
self.groupicon = Gtk.Image()
|
||||||
self.bellicon = Gtk.Image()
|
self.bellicon = Gtk.Image()
|
||||||
self.bellicon.set_no_show_all(True)
|
self.bellicon.set_no_show_all(True)
|
||||||
|
@ -85,8 +85,10 @@ class Titlebar(Gtk.EventBox):
|
||||||
hbox.pack_start(self.label, True, True, 0)
|
hbox.pack_start(self.label, True, True, 0)
|
||||||
hbox.pack_end(self.bellicon, False, False, 2)
|
hbox.pack_end(self.bellicon, False, False, 2)
|
||||||
|
|
||||||
self.add(hbox)
|
viewport = Gtk.Viewport(hscroll_policy='natural')
|
||||||
hbox.show_all()
|
viewport.add(hbox)
|
||||||
|
self.add (viewport)
|
||||||
|
viewport.show_all()
|
||||||
self.set_no_show_all(True)
|
self.set_no_show_all(True)
|
||||||
self.show()
|
self.show()
|
||||||
|
|
||||||
|
|
|
@ -378,7 +378,6 @@ class Window(Container, Gtk.Window):
|
||||||
if value:
|
if value:
|
||||||
dbg('setting rgba visual')
|
dbg('setting rgba visual')
|
||||||
visual = screen.get_rgba_visual()
|
visual = screen.get_rgba_visual()
|
||||||
|
|
||||||
if visual:
|
if visual:
|
||||||
self.set_visual(visual)
|
self.set_visual(visual)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue