Merge branch 'line-height' of https://github.com/mattrose/terminator into issue_111
This commit is contained in:
commit
c4a6ac96c8
|
@ -235,6 +235,7 @@ DEFAULTS = {
|
||||||
'use_system_font' : True,
|
'use_system_font' : True,
|
||||||
'use_theme_colors' : False,
|
'use_theme_colors' : False,
|
||||||
'bold_is_bright' : False,
|
'bold_is_bright' : False,
|
||||||
|
'line_height' : 1.0,
|
||||||
'encoding' : 'UTF-8',
|
'encoding' : 'UTF-8',
|
||||||
'active_encodings' : ['UTF-8', 'ISO-8859-1'],
|
'active_encodings' : ['UTF-8', 'ISO-8859-1'],
|
||||||
'focus_on_close' : 'auto',
|
'focus_on_close' : 'auto',
|
||||||
|
|
|
@ -694,6 +694,8 @@ class Terminal(Gtk.VBox):
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
self.vte.set_allow_bold(self.config['allow_bold'])
|
self.vte.set_allow_bold(self.config['allow_bold'])
|
||||||
|
if hasattr(self.vte,'set_cell_height_scale'):
|
||||||
|
self.vte.set_cell_height_scale(self.config['line_height'])
|
||||||
if hasattr(self.vte, 'set_bold_is_bright'):
|
if hasattr(self.vte, 'set_bold_is_bright'):
|
||||||
self.vte.set_bold_is_bright(self.config['bold_is_bright'])
|
self.vte.set_bold_is_bright(self.config['bold_is_bright'])
|
||||||
|
|
||||||
|
@ -813,6 +815,7 @@ class Terminal(Gtk.VBox):
|
||||||
elif self.config['scrollbar_position'] == 'right':
|
elif self.config['scrollbar_position'] == 'right':
|
||||||
self.terminalbox.reorder_child(self.vte, 0)
|
self.terminalbox.reorder_child(self.vte, 0)
|
||||||
|
|
||||||
|
|
||||||
self.vte.set_rewrap_on_resize(self.config['rewrap_on_resize'])
|
self.vte.set_rewrap_on_resize(self.config['rewrap_on_resize'])
|
||||||
|
|
||||||
self.titlebar.update()
|
self.titlebar.update()
|
||||||
|
|
Loading…
Reference in New Issue