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

merge approved branch. Closes LP #328235

This commit is contained in:
Chris Jones 2009-03-06 11:15:41 +00:00
parent 118032dc35 d467d1ae75
commit 5e46e1a967
2 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
terminatorlib/terminator.py
View File

@ -918,13 +918,18 @@ class Terminator:
edge = current_geo['origin_y'] edge = current_geo['origin_y']
# botoom edge of the possible target # botoom edge of the possible target
new_edge = possible_geo['origin_y']+possible_geo['span_y'] new_edge = possible_geo['origin_y']+possible_geo['span_y']
# Width of the horizontal bar that splits terminals
horizontalBar = self.term_list[0].get_parent().style_get_property('handle-size') + self.term_list[0]._titlebox.get_allocation().height
# Vertical distance between two terminals
distance = current_geo['offset_y'] - (possible_geo['offset_y'] + possible_geo['span_y'])
if new_edge < edge: if new_edge < edge:
#print "new_edge < edge" #print "new_edge < edge"
if best_geo is None: if best_geo is None:
#print "first thing left" #print "first thing left"
return True return True
best_edge = best_geo['origin_y']+best_geo['span_y'] best_edge = best_geo['origin_y']+best_geo['span_y']
if new_edge > best_edge: if new_edge > best_edge and distance == horizontalBar:
#print "closer y" #print "closer y"
return True return True
if new_edge == best_edge: if new_edge == best_edge:
@ -937,6 +942,9 @@ class Terminator:
if abs(new_cursor - cursor) < abs(best_cursor - cursor): if abs(new_cursor - cursor) < abs(best_cursor - cursor):
#print "closer x" #print "closer x"
return True return True
else:
if distance == horizontalBar:
return True
#print "fail" #print "fail"
return False return False
@ -950,6 +958,11 @@ class Terminator:
# top edge of the possible target # top edge of the possible target
new_edge = possible_geo['origin_y'] new_edge = possible_geo['origin_y']
#print "edge: %d new_edge: %d" % (edge, new_edge) #print "edge: %d new_edge: %d" % (edge, new_edge)
# Width of the horizontal bar that splits terminals
horizontalBar = self.term_list[0].get_parent().style_get_property('handle-size') + self.term_list[0]._titlebox.get_allocation().height
# Vertical distance between two terminals
distance = possible_geo['offset_y'] - (current_geo['offset_y'] + current_geo['span_y'])
if new_edge > edge: if new_edge > edge:
#print "new_edge > edge" #print "new_edge > edge"
if best_geo is None: if best_geo is None:
@ -957,7 +970,7 @@ class Terminator:
return True return True
best_edge = best_geo['origin_y'] best_edge = best_geo['origin_y']
#print "best_edge: %d" % (best_edge) #print "best_edge: %d" % (best_edge)
if new_edge < best_edge: if new_edge < best_edge and distance == horizontalBar:
#print "closer y" #print "closer y"
return True return True
if new_edge == best_edge: if new_edge == best_edge:
@ -970,6 +983,9 @@ class Terminator:
if abs(new_cursor - cursor) < abs(best_cursor - cursor): if abs(new_cursor - cursor) < abs(best_cursor - cursor):
#print "closer x" #print "closer x"
return True return True
else:
if distance == horizontalBar:
return True
#print "fail" #print "fail"
return False return False
@ -982,13 +998,23 @@ class Terminator:
edge = current_geo['origin_x'] edge = current_geo['origin_x']
# right-side edge of the possible target # right-side edge of the possible target
new_edge = possible_geo['origin_x']+possible_geo['span_x'] new_edge = possible_geo['origin_x']+possible_geo['span_x']
# Width of the horizontal bar that splits terminals
horizontalBar = self.term_list[0].get_parent().style_get_property('handle-size') + self.term_list[0]._titlebox.get_allocation().height
# Width of the vertical bar that splits terminals
if self.term_list[0].is_scrollbar_present():
verticalBar = self.term_list[0].get_parent().style_get_property('handle-size') + self.term_list[0].get_parent().style_get_property('scroll-arrow-vlength')
else:
verticalBar = self.term_list[0].get_parent().style_get_property('handle-size')
# Horizontal distance between two terminals
distance = current_geo['offset_x'] - (possible_geo['offset_x'] + possible_geo['span_x'])
if new_edge < edge: if new_edge < edge:
#print "new_edge(%d) < edge(%d)" % (new_edge, edge) #print "new_edge(%d) < edge(%d)" % (new_edge, edge)
if best_geo is None: if best_geo is None:
#print "first thing left" #print "first thing left"
return True return True
best_edge = best_geo['origin_x']+best_geo['span_x'] best_edge = best_geo['origin_x']+best_geo['span_x']
if new_edge > best_edge: if new_edge > best_edge and distance == verticalBar:
#print "closer x (new_edge(%d) > best_edge(%d))" % (new_edge, best_edge) #print "closer x (new_edge(%d) > best_edge(%d))" % (new_edge, best_edge)
return True return True
if new_edge == best_edge: if new_edge == best_edge:
@ -998,7 +1024,7 @@ class Terminator:
new_cursor = possible_geo['origin_y'] + possible_geo['cursor_y'] new_cursor = possible_geo['origin_y'] + possible_geo['cursor_y']
best_cursor = best_geo['origin_y'] + best_geo['cursor_y'] best_cursor = best_geo['origin_y'] + best_geo['cursor_y']
if abs(new_cursor - cursor) < abs(best_cursor - cursor): if abs(new_cursor - cursor) < abs(best_cursor - cursor) and distance <> horizontalBar:
#print "closer y" #print "closer y"
return True return True
#print "fail" #print "fail"
@ -1014,6 +1040,16 @@ class Terminator:
# left-side edge of the possible target # left-side edge of the possible target
new_edge = possible_geo['origin_x'] new_edge = possible_geo['origin_x']
#print "edge: %d new_edge: %d" % (edge, new_edge) #print "edge: %d new_edge: %d" % (edge, new_edge)
# Width of the horizontal bar that splits terminals
horizontalBar = self.term_list[0].get_parent().style_get_property('handle-size') + self.term_list[0]._titlebox.get_allocation().height
# Width of the vertical bar that splits terminals
if self.term_list[0].is_scrollbar_present():
verticalBar = self.term_list[0].get_parent().style_get_property('handle-size') + self.term_list[0].get_parent().style_get_property('scroll-arrow-vlength')
else:
verticalBar = self.term_list[0].get_parent().style_get_property('handle-size')
# Horizontal distance between two terminals
distance = possible_geo['offset_x'] - (current_geo['offset_x'] + current_geo['span_x'])
if new_edge > edge: if new_edge > edge:
#print "new_edge > edge" #print "new_edge > edge"
if best_geo is None: if best_geo is None:
@ -1021,7 +1057,7 @@ class Terminator:
return True return True
best_edge = best_geo['origin_x'] best_edge = best_geo['origin_x']
#print "best_edge: %d" % (best_edge) #print "best_edge: %d" % (best_edge)
if new_edge < best_edge: if new_edge < best_edge and distance == verticalBar:
#print "closer x" #print "closer x"
return True return True
if new_edge == best_edge: if new_edge == best_edge:
@ -1031,7 +1067,7 @@ class Terminator:
new_cursor = possible_geo['origin_y'] + possible_geo['cursor_y'] new_cursor = possible_geo['origin_y'] + possible_geo['cursor_y']
best_cursor = best_geo['origin_y'] + best_geo['cursor_y'] best_cursor = best_geo['origin_y'] + best_geo['cursor_y']
if abs(new_cursor - cursor) < abs(best_cursor - cursor): if abs(new_cursor - cursor) < abs(best_cursor - cursor) and distance <> horizontalBar:
#print "closer y" #print "closer y"
return True return True
#print "fail" #print "fail"

3
terminatorlib/terminatorterm.py
View File

@ -1410,4 +1410,7 @@ text/plain
label.set_title(title) label.set_title(title)
notebookpage[0].set_tab_label(notebookpage[1], label) notebookpage[0].set_tab_label(notebookpage[1], label)
notebookpage = self.terminator.get_first_notebook_page(notebookpage[0]) notebookpage = self.terminator.get_first_notebook_page(notebookpage[0])
def is_scrollbar_present(self):
return self._scrollbar.get_property('visible')