gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-22 14:08:06 +01:00
Code Issues Projects Releases Wiki Activity

Allow setting "FrameFocusedBorderColor" from WPrefs

Browse Source 
Adds separate entry in menu and draws border around focused window.

Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
This commit is contained in:
Amadeusz Sławiński
2014-05-19 22:27:23 +02:00
committed by Carlos R. Mafra
parent bc8ccee72f
commit c6991fb991
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
WPrefs.app/Appearance.c
View File

@@ -331,6 +331,7 @@ enum {
MDISAB_COL, MDISAB_COL,
MHIGH_COL, MHIGH_COL,
MHIGHT_COL, MHIGHT_COL,
FFBORDER_COL,
FBORDER_COL, FBORDER_COL,
FSBORDER_COL, FSBORDER_COL,
ICONT_COL, ICONT_COL,
@@ -351,6 +352,7 @@ static const struct {
{ "MenuDisabledColor", "#616161" }, { "MenuDisabledColor", "#616161" },
{ "HighlightColor", "white" }, { "HighlightColor", "white" },
{ "HighlightTextColor", "black" }, { "HighlightTextColor", "black" },
{ "FrameFocusedBorderColor", "black" },
{ "FrameBorderColor", "black" }, { "FrameBorderColor", "black" },
{ "FrameSelectedBorderColor", "white" }/* , */ { "FrameSelectedBorderColor", "white" }/* , */
/* { "IconTitleColor", "white" }, */ /* { "IconTitleColor", "white" }, */
@@ -390,6 +392,7 @@ static WMRect previewColorPositions[] = {
{{30, 200}, {90, 20}}, {{30, 200}, {90, 20}},
{{0, 0}, {0, 0}}, {{0, 0}, {0, 0}},
{{0, 0}, {0, 0}}, {{0, 0}, {0, 0}},
{{0, 0}, {0, 0}},
{{155, 130}, {64, 64}}, {{155, 130}, {64, 64}},
{{155, 130}, {64, 64}}, {{155, 130}, {64, 64}},
{{155, 130}, {64, 64}}, {{155, 130}, {64, 64}},
@@ -790,7 +793,7 @@ static void updatePreviewBox(_Panel * panel, int elements)
if (elements & (1 << PFOCUSED)) { if (elements & (1 << PFOCUSED)) {
renderPreview(panel, gc, PFOCUSED, RBEV_RAISED2); renderPreview(panel, gc, PFOCUSED, RBEV_RAISED2);
colorUpdate |= 1 << FTITLE_COL | 1 << FBORDER_COL; colorUpdate |= 1 << FTITLE_COL | 1 << FFBORDER_COL;
} }
if (elements & (1 << PUNFOCUSED)) { if (elements & (1 << PUNFOCUSED)) {
renderPreview(panel, gc, PUNFOCUSED, RBEV_RAISED2); renderPreview(panel, gc, PUNFOCUSED, RBEV_RAISED2);
@@ -1372,6 +1375,7 @@ static void changeColorPage(WMWidget * w, void *data)
{5, 180}, {5, 180},
{-22, -21}, {-22, -21},
{-22, -21}, {-22, -21},
{-22, -21},
{130, 140}, {130, 140},
{130, 140}, {130, 140},
{130, 140}, {130, 140},
@@ -1492,12 +1496,6 @@ static void updateColorPreviewBox(_Panel * panel, int elements)
_("Highlighted")); _("Highlighted"));
} }
if (elements & (1 << FBORDER_COL)) { if (elements & (1 << FBORDER_COL)) {
XDrawRectangle(dpy, pnot,
WMColorGC(panel->colors[FBORDER_COL]),
29, 9, 190, 20);
XDrawRectangle(dpy, d,
WMColorGC(panel->colors[FBORDER_COL]),
29, 9, 190, 20);
XDrawRectangle(dpy, pnot, XDrawRectangle(dpy, pnot,
WMColorGC(panel->colors[FBORDER_COL]), WMColorGC(panel->colors[FBORDER_COL]),
29, 39, 190, 20); 29, 39, 190, 20);
@@ -1548,6 +1546,15 @@ static void updateColorPreviewBox(_Panel * panel, int elements)
119, 120, 119, 220); 119, 120, 119, 220);
} }
if (elements & (1 << FFBORDER_COL)) {
XDrawRectangle(dpy, pnot,
WMColorGC(panel->colors[FFBORDER_COL]),
29, 9, 190, 20);
XDrawRectangle(dpy, d,
WMColorGC(panel->colors[FFBORDER_COL]),
29, 9, 190, 20);
}
/* /*
if (elements & (1 << ICONT_COL)) { if (elements & (1 << ICONT_COL)) {
WRITE(_("Focused Window"), panel->colors[ICONT_COL], WRITE(_("Focused Window"), panel->colors[ICONT_COL],
@@ -1839,6 +1846,7 @@ static void createPanel(Panel * p)
WMAddPopUpButtonItem(panel->colP, _("Disabled Menu Item Text")); WMAddPopUpButtonItem(panel->colP, _("Disabled Menu Item Text"));
WMAddPopUpButtonItem(panel->colP, _("Menu Highlight Color")); WMAddPopUpButtonItem(panel->colP, _("Menu Highlight Color"));
WMAddPopUpButtonItem(panel->colP, _("Highlighted Menu Text Color")); WMAddPopUpButtonItem(panel->colP, _("Highlighted Menu Text Color"));
WMAddPopUpButtonItem(panel->colP, _("Focused Window Border Color"));
WMAddPopUpButtonItem(panel->colP, _("Window Border Color")); WMAddPopUpButtonItem(panel->colP, _("Window Border Color"));
WMAddPopUpButtonItem(panel->colP, _("Selected Window Border Color")); WMAddPopUpButtonItem(panel->colP, _("Selected Window Border Color"));
/* /*