|
diff -aur plugins-main.orig/metadata/resizeinfo.xml.in plugins-main/metadata/resizeinfo.xml.in |
|
--- plugins-main.orig/metadata/resizeinfo.xml.in 2015-01-06 06:54:53.000000000 -0800 |
|
+++ plugins-main/metadata/resizeinfo.xml.in 2015-12-08 18:53:54.809151850 -0800 |
|
@@ -24,6 +24,11 @@ |
|
windows with a resize increment of greater than 1. </_long> |
|
<default>false</default> |
|
</option> |
|
+ <option name="text_family" type="string"> |
|
+ <_short>Font family</_short> |
|
+ <_long>Name of the font to display resize info.</_long> |
|
+ <default>Sans</default> |
|
+ </option> |
|
<option name="text_color" type="color"> |
|
<_short> Text color. </_short> |
|
<_long> Color of text on resize popup. </_long> |
|
diff -aur plugins-main.orig/metadata/ring.xml.in plugins-main/metadata/ring.xml.in |
|
--- plugins-main.orig/metadata/ring.xml.in 2015-01-06 06:54:53.000000000 -0800 |
|
+++ plugins-main/metadata/ring.xml.in 2015-12-08 18:46:16.196258337 -0800 |
|
@@ -191,6 +191,13 @@ |
|
<_long>Show window title of currently selected window.</_long> |
|
<default>true</default> |
|
</option> |
|
+ |
|
+ <option name="title_font" type="string"> |
|
+ <_short>Font family</_short> |
|
+ <_long>Name of the font to display title.</_long> |
|
+ <default>Sans</default> |
|
+ </option> |
|
+ |
|
<option name="title_font_bold" type="bool"> |
|
<_short>Bold Font</_short> |
|
<_long>Selects if the window title should be displayed in bold font or not.</_long> |
|
diff -aur plugins-main.orig/metadata/scaleaddon.xml.in plugins-main/metadata/scaleaddon.xml.in |
|
--- plugins-main.orig/metadata/scaleaddon.xml.in 2015-01-06 06:54:53.000000000 -0800 |
|
+++ plugins-main/metadata/scaleaddon.xml.in 2015-12-08 18:48:25.170415309 -0800 |
|
@@ -80,6 +80,12 @@ |
|
<_name>All windows</_name> |
|
</desc> |
|
</option> |
|
+ <option type="string" name="title_font"> |
|
+ <_short>Font family</_short> |
|
+ <_long>Name of the font to display title.</_long> |
|
+ <default>Sans</default> |
|
+ </option> |
|
+ |
|
<option name="title_bold" type="bool"> |
|
<_short>Bold Font</_short> |
|
<_long>Use bold font for window title display</_long> |
|
diff -aur plugins-main.orig/metadata/shift.xml.in plugins-main/metadata/shift.xml.in |
|
--- plugins-main.orig/metadata/shift.xml.in 2015-01-06 06:54:53.000000000 -0800 |
|
+++ plugins-main/metadata/shift.xml.in 2015-12-08 18:50:40.914599330 -0800 |
|
@@ -303,6 +303,11 @@ |
|
<_long>Show window title of currently selected window.</_long> |
|
<default>true</default> |
|
</option> |
|
+ <option type="string" name="title_font_family"> |
|
+ <_short>Font family</_short> |
|
+ <_long>Name of the font to display title.</_long> |
|
+ <default>Sans</default> |
|
+ </option> |
|
<option name="title_font_bold" type="bool"> |
|
<_short>Bold Font</_short> |
|
<_long>Selects if the window title should be displayed in bold font or not.</_long> |
|
diff -aur plugins-main.orig/metadata/thumbnail.xml.in plugins-main/metadata/thumbnail.xml.in |
|
--- plugins-main.orig/metadata/thumbnail.xml.in 2015-01-06 06:54:53.000000000 -0800 |
|
+++ plugins-main/metadata/thumbnail.xml.in 2015-12-08 18:49:50.460949531 -0800 |
|
@@ -84,6 +84,11 @@ |
|
<_long>Show Window Title in Thumbnail.</_long> |
|
<default>true</default> |
|
</option> |
|
+ <option type="string" name="font_family"> |
|
+ <_short>Font family</_short> |
|
+ <_long>Name of the font to display title.</_long> |
|
+ <default>Sans</default> |
|
+ </option> |
|
<option name="font_bold" type="bool"> |
|
<_short>Bold Font</_short> |
|
<_long>Should be the window title Bold.</_long> |
|
diff -aur plugins-main.orig/src/resizeinfo/resizeinfo.c plugins-main/src/resizeinfo/resizeinfo.c |
|
--- plugins-main.orig/src/resizeinfo/resizeinfo.c 2015-01-06 06:54:53.000000000 -0800 |
|
+++ plugins-main/src/resizeinfo/resizeinfo.c 2015-12-08 18:40:51.677408894 -0800 |
|
@@ -209,7 +209,7 @@ |
|
font = pango_font_description_new (); |
|
layout = pango_cairo_create_layout (is->textLayer.cr); |
|
|
|
- pango_font_description_set_family (font,"Sans"); |
|
+ pango_font_description_set_family (font, resizeinfoGetTextFamily(s->display)); |
|
pango_font_description_set_absolute_size (font, 12 * PANGO_SCALE); |
|
pango_font_description_set_style (font, PANGO_STYLE_NORMAL); |
|
pango_font_description_set_weight (font, PANGO_WEIGHT_BOLD); |
|
diff -aur plugins-main.orig/src/ring/ring.c plugins-main/src/ring/ring.c |
|
--- plugins-main.orig/src/ring/ring.c 2015-01-06 06:54:53.000000000 -0800 |
|
+++ plugins-main/src/ring/ring.c 2015-12-08 18:42:19.461331771 -0800 |
|
@@ -248,7 +248,7 @@ |
|
attrib.flags = CompTextFlagWithBackground | CompTextFlagEllipsized; |
|
if (ringGetTitleFontBold (s)) |
|
attrib.flags |= CompTextFlagStyleBold; |
|
- attrib.family = "Sans"; |
|
+ attrib.family = ringGetTitleFont(s); |
|
attrib.bgHMargin = 15; |
|
attrib.bgVMargin = 15; |
|
attrib.bgColor[0] = ringGetTitleBackColorRed (s); |
|
diff -aur plugins-main.orig/src/scaleaddon/scaleaddon.c plugins-main/src/scaleaddon/scaleaddon.c |
|
--- plugins-main.orig/src/scaleaddon/scaleaddon.c 2015-01-06 06:54:53.000000000 -0800 |
|
+++ plugins-main/src/scaleaddon/scaleaddon.c 2015-12-08 18:37:57.562908309 -0800 |
|
@@ -148,7 +148,7 @@ |
|
attrib.maxWidth = w->attrib.width * scale; |
|
attrib.maxHeight = w->attrib.height * scale; |
|
|
|
- attrib.family = "Sans"; |
|
+ attrib.family = scaleaddonGetTitleFont(s); |
|
attrib.size = scaleaddonGetTitleSize (s); |
|
attrib.color[0] = scaleaddonGetFontColorRed (s); |
|
attrib.color[1] = scaleaddonGetFontColorGreen (s); |
|
@@ -1135,6 +1135,7 @@ |
|
switch (num) |
|
{ |
|
case ScaleaddonScreenOptionWindowTitle: |
|
+ case ScaleaddonScreenOptionTitleFont: |
|
case ScaleaddonScreenOptionTitleBold: |
|
case ScaleaddonScreenOptionTitleSize: |
|
case ScaleaddonScreenOptionBorderSize: |
|
@@ -1258,6 +1259,7 @@ |
|
scaleaddonLayoutSlotsAndAssignWindows); |
|
|
|
scaleaddonSetWindowTitleNotify (s, scaleaddonScreenOptionChanged); |
|
+ scaleaddonSetTitleFontNotify (s, scaleaddonScreenOptionChanged); |
|
scaleaddonSetTitleBoldNotify (s, scaleaddonScreenOptionChanged); |
|
scaleaddonSetTitleSizeNotify (s, scaleaddonScreenOptionChanged); |
|
scaleaddonSetBorderSizeNotify (s, scaleaddonScreenOptionChanged); |
|
diff -aur plugins-main.orig/src/shift/shift.c plugins-main/src/shift/shift.c |
|
--- plugins-main.orig/src/shift/shift.c 2015-01-06 06:54:53.000000000 -0800 |
|
+++ plugins-main/src/shift/shift.c 2015-12-08 18:41:44.751098579 -0800 |
|
@@ -315,7 +315,7 @@ |
|
tA.maxWidth = (ox2 - ox1) * 3 / 4; |
|
tA.maxHeight = 100; |
|
|
|
- tA.family = "Sans"; |
|
+ tA.family = shiftGetTitleFontFamily(s); |
|
tA.size = shiftGetTitleFontSize (s); |
|
tA.color[0] = shiftGetTitleFontColorRed (s); |
|
tA.color[1] = shiftGetTitleFontColorGreen (s); |
|
diff -aur plugins-main.orig/src/thumbnail/thumbnail.c plugins-main/src/thumbnail/thumbnail.c |
|
--- plugins-main.orig/src/thumbnail/thumbnail.c 2015-01-06 06:54:53.000000000 -0800 |
|
+++ plugins-main/src/thumbnail/thumbnail.c 2015-12-08 18:35:36.615298827 -0800 |
|
@@ -154,7 +154,7 @@ |
|
tA.flags = CompTextFlagEllipsized; |
|
if (thumbnailGetFontBold (s)) |
|
tA.flags |= CompTextFlagStyleBold; |
|
- tA.family = "Sans"; |
|
+ tA.family = thumbnailGetFontFamily(s); |
|
|
|
t->textData = (td->textFunc->renderWindowTitle) (s, t->win->id, FALSE, &tA); |
|
} |