Commit 47b3e8d0 authored by Kai Willadsen's avatar Kai Willadsen

Move FindBar positioning to main table rather than external vbox

Packing in the main table loses us some small amount of flexibility,
but it's the easiest way to get spacing correct, e.g., lining up with
the left edge of the first textview.
parent 52bcfbac
......@@ -11,7 +11,7 @@
<child>
<object class="GtkTable" id="table">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_rows">3</property>
<property name="n_columns">7</property>
<child>
<placeholder/>
......
......@@ -322,11 +322,10 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
self.actiongroup.set_translation_domain("meld")
self.actiongroup.add_actions(actions)
self.actiongroup.add_toggle_actions(toggle_actions)
self.findbar = findbar.FindBar(self.table)
self.set_num_panes(num_panes)
gobject.idle_add( lambda *args: self.load_font()) # hack around Bug 316730
gnomeglade.connect_signal_handlers(self)
self.findbar = findbar.FindBar(self.filediff)
self.filediff.pack_end(self.findbar.widget, False)
self.cursor = CursorDetails()
self.connect("current-diff-changed", self.on_current_diff_changed)
for t in self.textview:
......@@ -1586,6 +1585,12 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
tohide += self.linkmap[n-1:] + self.diffmap[n:]
map( lambda x: x.hide(), tohide )
right_attach = 2 * n
if self.findbar.widget in self.table:
self.table.remove(self.findbar.widget)
self.table.attach(self.findbar.widget, 1, right_attach, 2, 3,
gtk.FILL, gtk.FILL)
self.actiongroup.get_action("MakePatch").set_sensitive(n > 1)
self.actiongroup.get_action("CycleDocuments").set_sensitive(n > 1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment