pull in changes from 0.8
This commit is contained in:
commit
552c875227
|
@ -1,6 +1,7 @@
|
||||||
terminator 0.8.1:
|
terminator 0.8.1:
|
||||||
* Fixed ChangeLog
|
* Fixed ChangeLog
|
||||||
* Revert URI matching behaviour to the same as gnome-terminal
|
* Revert URI matching behaviour to the same as gnome-terminal
|
||||||
|
* Close LP #179315 with a fuller fix that provides proper colour support
|
||||||
|
|
||||||
terminator 0.8:
|
terminator 0.8:
|
||||||
* Make dependency on python-gnome optional. Non-gnome users can now reap
|
* Make dependency on python-gnome optional. Non-gnome users can now reap
|
||||||
|
|
|
@ -135,7 +135,7 @@ class TerminatorTerm:
|
||||||
self._box.show ()
|
self._box.show ()
|
||||||
|
|
||||||
self._scrollbar = gtk.VScrollbar (self._vte.get_adjustment ())
|
self._scrollbar = gtk.VScrollbar (self._vte.get_adjustment ())
|
||||||
if self.scrollbar_position != "hidden":
|
if self.scrollbar_position != "hidden" and self.scrollbar_position != "disabled":
|
||||||
self._scrollbar.show ()
|
self._scrollbar.show ()
|
||||||
|
|
||||||
if self.scrollbar_position == 'right':
|
if self.scrollbar_position == 'right':
|
||||||
|
@ -305,7 +305,7 @@ class TerminatorTerm:
|
||||||
scrollbar_position = self.reconf ('scrollbar_position')
|
scrollbar_position = self.reconf ('scrollbar_position')
|
||||||
|
|
||||||
if scrollbar_position != self.scrollbar_position:
|
if scrollbar_position != self.scrollbar_position:
|
||||||
if scrollbar_position == 'hidden':
|
if scrollbar_position == 'hidden' or scrollbar_position == 'disabled':
|
||||||
self._scrollbar.hide ()
|
self._scrollbar.hide ()
|
||||||
else:
|
else:
|
||||||
self._scrollbar.show ()
|
self._scrollbar.show ()
|
||||||
|
|
Loading…
Reference in New Issue