diff options
author | Robin Gareus <robin@gareus.org> | 2015-04-06 21:01:59 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2015-04-06 21:01:59 +0200 |
commit | 537b3a2a0e34f1e49d47b8a51d08c690e02f1454 (patch) | |
tree | d345ff818410e7d3da4555170e3ebbd4942fbbe0 | |
parent | 098ef68bb8f0f5050b8d5f4f9d7ad1addab33ca2 (diff) |
Separate MonoSpace & Clock font.
Fixes various issues on OSX (e.g. MIDI-tracer &
list editor Layout)
-rw-r--r-- | gtk2_ardour/clearlooks.rc.in | 28 | ||||
-rw-r--r-- | gtk2_ardour/wscript | 4 |
2 files changed, 17 insertions, 15 deletions
diff --git a/gtk2_ardour/clearlooks.rc.in b/gtk2_ardour/clearlooks.rc.in index 3569253fe5..081629face 100644 --- a/gtk2_ardour/clearlooks.rc.in +++ b/gtk2_ardour/clearlooks.rc.in @@ -233,9 +233,9 @@ style "small_text" font_name = "@FONT_SMALL@" } -style "small_mono_text" +style "small_clock" { - font_name = "@MONOSPACE@ @FONT_SMALLER@" + font_name = "@CLOCKFONT@ @FONT_SMALLER@" } style "small_italic_text" @@ -280,9 +280,9 @@ style "big_text" font_name = "@FONT_BIG@" } -style "bigger_mono_text" +style "bigger_clock" { - font_name = "@MONOSPACE@ @FONT_BIGGER@" + font_name = "@CLOCKFONT@ @FONT_BIGGER@" } style "larger_text" @@ -290,9 +290,9 @@ style "larger_text" font_name = "@FONT_LARGE@" } -style "monospace massive_text" +style "massive_clock" { - font_name = "@MONOSPACE@ bold @FONT_MASSIVE@" + font_name = "@CLOCKFONT@ bold @FONT_MASSIVE@" } style "big_bold_text" @@ -1055,16 +1055,16 @@ widget "*FatalMessage" style:highest "fatal_message" widget "*InfoMessage" style:highest "info_message" widget "*WarningMessage" style:highest "warning_message" -widget "*big clock" style:highest "monospace massive_text" -widget "*selection clock" style:highest "small_mono_text" -widget "*punch clock" style:highest "small_mono_text" -widget "*transport clock" style:highest "bigger_mono_text" -widget "*secondary clock" style:highest "bigger_mono_text" -widget "*transport delta clock" style:highest "bigger_mono_text" -widget "*secondary delta clock" style:highest "bigger_mono_text" +widget "*big clock" style:highest "massive_clock" +widget "*selection clock" style:highest "small_clock" +widget "*punch clock" style:highest "small_clock" +widget "*transport clock" style:highest "bigger_clock" +widget "*secondary clock" style:highest "bigger_clock" +widget "*transport delta clock" style:highest "bigger_clock" +widget "*secondary delta clock" style:highest "bigger_clock" widget "*silence duration clock" style:highest "medium_text" widget "*edit point clock" style:highest "medium_text" -widget "*nudge clock" style:highest "small_mono_text" +widget "*nudge clock" style:highest "small_clock" widget "*menubar clock" style:highest "medium_text" widget "*zoomrange clock" style:highest "medium_text" widget "*timecodeoffset clock" style:highest "medium_text" diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index e77dce6562..9cc2a508aa 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -567,7 +567,8 @@ def build(bld): # so just use it. # font_names = { - 'MONOSPACE' : 'Lucida Grande', + 'MONOSPACE' : 'Monaco', + 'CLOCKFONT' : 'Lucida Grande', } else: # Linux/X11 fonts basefont = '' # unspecified - use system defaults @@ -584,6 +585,7 @@ def build(bld): } font_names = { 'MONOSPACE' : 'ArdourMono', + 'CLOCKFONT' : 'ArdourMono', } # Set up font substitution dictionary |