itdominator
/
terminator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(trunk-1579) Fix slightly uneven splits on shortcut due to handle size, though this will make previously saved layouts off by a few pixels (Steve Boddy, LP#1089162)" 

Also broke the getting of the handle bar size out into a function.
This commit is contained in:
Stephen Boddy 2015-07-15 20:09:32 +02:00
parent 85532f980c a6e72c1d63
commit 2c002e5139
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
terminatorlib/paned.py
View File

@ -198,9 +198,7 @@ class Paned(Container):
#3 Get ancestor x/y => a, and handle size => hs #3 Get ancestor x/y => a, and handle size => hs
avail_pixels=self.get_length() avail_pixels=self.get_length()
value = GObject.Value(int) handle_size = self.get_handlesize()
self.style_get_property('handle-size', value)
handle_size = value.get_int()
#4 Math! eek (a - (n * hs)) / (n + 1) = single size => s #4 Math! eek (a - (n * hs)) / (n + 1) = single size => s
single_size = (avail_pixels - (number_splits * handle_size)) / (number_splits + 1) single_size = (avail_pixels - (number_splits * handle_size)) / (number_splits + 1)
arr_sizes = [single_size]*(number_splits+1) arr_sizes = [single_size]*(number_splits+1)
@ -236,6 +234,15 @@ class Paned(Container):
metadata = {} metadata = {}
metadata['had_focus'] = widget.has_focus() metadata['had_focus'] = widget.has_focus()
def get_handlesize(self):
"""Why oh why, gtk3?"""
try:
value = GObject.Value(int)
self.style_get_property('handle-size', value)
return(value.get_int())
except:
return 0
def wrapcloseterm(self, widget): def wrapcloseterm(self, widget):
"""A child terminal has closed, so this container must die""" """A child terminal has closed, so this container must die"""
dbg('Paned::wrapcloseterm: Called on %s' % widget) dbg('Paned::wrapcloseterm: Called on %s' % widget)
@ -391,10 +398,12 @@ class Paned(Container):
self.set_position(self.get_position()) self.set_position(self.get_position())
def set_position_by_ratio(self): def set_position_by_ratio(self):
self.set_pos(int(self.ratio*self.get_length())) handle_size = handle_size = self.get_handlesize()
self.set_pos(int((self.ratio*self.get_length())-(handle_size/2.0)))
def set_position(self, pos): def set_position(self, pos):
self.ratio = float(pos) / self.get_length() handle_size = handle_size = self.get_handlesize()
self.ratio = float(pos + (handle_size/2.0)) / self.get_length()
self.set_pos(pos) self.set_pos(pos)
class HPaned(Paned, Gtk.HPaned): class HPaned(Paned, Gtk.HPaned):