From 97467fceff7c3631568188f5a01118854511831d Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Sat, 9 Sep 2017 22:09:02 +0200 Subject: [PATCH] Update small part of doc. set hadle-color on scrollbar in default theme. --- doc/default_theme.rasi | 1 + doc/old-theme-convert-output.rasi | 1 + doc/rofi-theme.5.markdown | 27 +++++++++++++++------------ include/default-theme.h | 1 + source/widgets/scrollbar.c | 1 - 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/doc/default_theme.rasi b/doc/default_theme.rasi index d34581e4..d75d4f57 100644 --- a/doc/default_theme.rasi +++ b/doc/default_theme.rasi @@ -96,6 +96,7 @@ #scrollbar { width: 4px ; border: 0; + handle-color: @normal-foreground; handle-width: 8px ; padding: 0; } diff --git a/doc/old-theme-convert-output.rasi b/doc/old-theme-convert-output.rasi index 20a0303b..ddc11fa5 100644 --- a/doc/old-theme-convert-output.rasi +++ b/doc/old-theme-convert-output.rasi @@ -97,6 +97,7 @@ #scrollbar { width: 4px ; border: 0; + handle-color: @normal-foreground; handle-width: 8px ; padding: 0; } diff --git a/doc/rofi-theme.5.markdown b/doc/rofi-theme.5.markdown index e2d220fb..1786cd38 100644 --- a/doc/rofi-theme.5.markdown +++ b/doc/rofi-theme.5.markdown @@ -574,10 +574,10 @@ The following properties are currently supported: ### scrollbar: -* **foreground**: color -* **handle-width**: distance -* **handle-color**: color -* **foreground**: color +* **background-color**: color +* **handle-width**: distance +* **handle-color**: color +* **border-color**: color ### box: @@ -636,24 +636,27 @@ The current layout of **rofi** is structured as follows: |------------------------------------------------------------------------------------| | #window {BOX:vertical} | | |-------------------------------------------------------------------------------| | -| | #window.mainbox {BOX:vertical} | | +| | #mainbox {BOX:vertical} | | | | |---------------------------------------------------------------------------| | | -| | | #window.mainbox.inputbar {BOX:horizontal} | | | -| | | |--------| |-------------------------------------------------------| |--| | | | -| | | | prompt | | entry | |ci| | | | -| | | |--------| |-------------------------------------------------------| |--| | | | +| | | #inputbar {BOX:horizontal} | | | +| | | |---------| |-----------------------------------------------------| |---| | | | +| | | | #prompt | | #entry | |#ci| | | | +| | | |---------| |-----------------------------------------------------| |---| | | | | | |---------------------------------------------------------------------------| | | | | | | | | |---------------------------------------------------------------------------| | | -| | | #window.mainbox.message | | | +| | | #message | | | +| | | |-----------------------------------------------------------------------| | | | +| | | | #textbox | | | | +| | | |-----------------------------------------------------------------------| | | | | | |---------------------------------------------------------------------------| | | | | | | | | |-----------------------------------------------------------------------------| | -| | | #window.mainbox.listview | | +| | | #listview | | | | |-----------------------------------------------------------------------------| | | | | | | | |---------------------------------------------------------------------------| | | -| | | #window.mainbox.sidebar {BOX:horizontal} | | | +| | | #sidebar {BOX:horizontal} | | | | | | |---------------| |---------------| |--------------| |---------------| | | | | | | | Button | | Button | | Button | | Button | | | | | | | |---------------| |---------------| |--------------| |---------------| | | | diff --git a/include/default-theme.h b/include/default-theme.h index bcc3fd49..045044a6 100644 --- a/include/default-theme.h +++ b/include/default-theme.h @@ -127,6 +127,7 @@ const char *default_theme = " border: 0;" " width: 4px;" " padding: 0;" + " handle-color: @normal-foreground;" "}" "#sidebar {" " border: 2px dash 0px 0px ;" diff --git a/source/widgets/scrollbar.c b/source/widgets/scrollbar.c index 32f92716..80fcbf7f 100644 --- a/source/widgets/scrollbar.c +++ b/source/widgets/scrollbar.c @@ -176,7 +176,6 @@ static void scrollbar_draw ( widget *wid, cairo_t *draw ) // Never go out of bar. height = MAX ( 2, height ); // Cap length; - rofi_theme_get_color ( WIDGET ( sb ), "foreground", draw ); rofi_theme_get_color ( WIDGET ( sb ), "handle-color", draw ); cairo_rectangle ( draw,