theme: set default values of window.*.border.color to #aaaaaa

This makes the colors of titlebar and window borders different, but will
let menu.border.color (which will be supported soon) inherit
window.active.border.color just like Openbox does, without making the menu
borders around a selected menu item invisible.

diff --git a/docs/labwc-theme.5.scd b/docs/labwc-theme.5.scd
index 3951b275a3f827004ea96b500001f05c65bd0466..9f4b2e9b7bd77c5d2593031468e473553f720090 100644 (file)
--- a/docs/labwc-theme.5.scd
+++ b/docs/labwc-theme.5.scd
@@ -60,10 +60,10 @@ labwc-config(5).
        Default is 0.
 
 *window.active.border.color*
-       Border color of active window. Default is #e1dedb.
+       Border color of active window. Default is #aaaaaa.
 
 *window.inactive.border.color*
-       Border color of inactive window. Default is #f6f5f4.
+       Border color of inactive window. Default is #aaaaaa.
 
 *window.active.indicator.toggled-keybind.color*
        Status indicator for the ToggleKeybinds action. Can be set to the same

diff --git a/docs/themerc b/docs/themerc
index 66bbe682ac50279f73c806fbce1c93397e3f0a50..8c6271710f32b8ac0fcba43dcf5b29876adddd2e 100644 (file)
--- a/docs/themerc
+++ b/docs/themerc
@@ -16,8 +16,8 @@ window.titlebar.padding.width: 0
 window.titlebar.padding.height: 0
 
 # window border
-window.active.border.color: #e1dedb
-window.inactive.border.color: #f6f5f4
+window.active.border.color: #aaaaaa
+window.inactive.border.color: #aaaaaa
 
 # ToggleKeybinds status indicator
 window.active.indicator.toggled-keybind.color: #ff0000

diff --git a/src/theme.c b/src/theme.c
index bea074004524d4375087bd03dee7e4d5d4a4c2a3..6e3ebbd88c37d9a38e5cece752f3fe56335aa1a9 100644 (file)
--- a/src/theme.c
+++ b/src/theme.c
@@ -563,8 +563,8 @@ theme_builtin(struct theme *theme, struct server *server)
        theme->window_titlebar_padding_height = 0;
        theme->window_titlebar_padding_width = 0;
 
-       parse_hexstr("#e1dedb", theme->window[THEME_ACTIVE].border_color);
-       parse_hexstr("#f6f5f4", theme->window[THEME_INACTIVE].border_color);
+       parse_hexstr("#aaaaaa", theme->window[THEME_ACTIVE].border_color);
+       parse_hexstr("#aaaaaa", theme->window[THEME_INACTIVE].border_color);
 
        parse_hexstr("#ff0000", theme->window_toggled_keybinds_color);