theme: add circle button hover effect (#2127)

diff --git a/docs/labwc-theme.5.scd b/docs/labwc-theme.5.scd
index 57b7aef91d7ddf8687944317dd4ed2468539fe2e..e1b7bcb73279868ccbfc4d9a16bb3f5b1d622aac 100644 (file)
--- a/docs/labwc-theme.5.scd
+++ b/docs/labwc-theme.5.scd
@@ -132,6 +132,10 @@ labwc-config(5).
        Space between titlebar buttons, in pixels.
        Default is 0.
 
+*window.button.hover.bg.shape*
+       The shape of the hover effect of a titlebar button: "rectangle" or "circle".
+       Default is "rectangle".
+
 *window.active.button.unpressed.image.color*
        Color of the images in titlebar buttons in their default, unpressed,
        state. This element is for the focused window.

diff --git a/docs/themerc b/docs/themerc
index 1e066074a74d04c12945451c6c0eb7238afc73dc..4906420707d661374d1ecaf57a6c77daf6565e80 100644 (file)
--- a/docs/themerc
+++ b/docs/themerc
@@ -34,6 +34,9 @@ window.label.text.justify: center
 window.button.width: 26
 window.button.spacing: 0
 
+# window button hover effect
+window.button.hover.bg.shape: rectangle
+
 # window buttons
 window.active.button.unpressed.image.color: #000000
 window.inactive.button.unpressed.image.color: #000000

diff --git a/include/theme.h b/include/theme.h
index 4705926e6ad94107fc4ab6ec538909afbae430d6..7f3eac901ee411158ddf10aa9ac16012c5675c50 100644 (file)
--- a/include/theme.h
+++ b/include/theme.h
@@ -17,6 +17,11 @@ enum lab_justification {
        LAB_JUSTIFY_RIGHT,
 };
 
+enum lab_shape {
+       LAB_RECTANGLE,
+       LAB_CIRCLE,
+};
+
 struct theme_snapping_overlay {
        bool bg_enabled;
        bool border_enabled;
@@ -57,6 +62,8 @@ struct theme {
        int window_button_width;
        /* the space between buttons */
        int window_button_spacing;
+       /* the shape of the hover effect */
+       enum lab_shape window_button_hover_bg_shape;
 
        /* button colors */
        float window_active_button_menu_unpressed_image_color[4];

diff --git a/src/theme.c b/src/theme.c
index bb4948a064f8aefc6621b52b4b903f27da4c049e..431b653ef9ea2d579c50d35d66a772c555f191b7 100644 (file)
--- a/src/theme.c
+++ b/src/theme.c
@@ -70,6 +70,9 @@ struct rounded_corner_ctx {
 
 static struct lab_data_buffer *rounded_rect(struct rounded_corner_ctx *ctx);
 
+/* 1 degree in radians (=2π/360) */
+static const double deg = 0.017453292519943295;
+
 static void
 zdrop(struct lab_data_buffer **buffer)
 {
@@ -162,26 +165,36 @@ create_hover_fallback(struct theme *theme, const char *icon_name,
 
        /* Overlay (pre-multiplied alpha) */
        float overlay_color[4] = { 0.15f, 0.15f, 0.15f, 0.3f};
+       int radius = MIN(width, height) / 2;
        enum corner corner = corner_from_icon_name(icon_name);
 
-       if (corner == LAB_CORNER_UNKNOWN) {
+       switch (theme->window_button_hover_bg_shape) {
+       case LAB_CIRCLE:
                set_cairo_color(cairo, overlay_color);
-               cairo_rectangle(cairo, 0, 0, width, height);
+               cairo_arc(cairo, width / 2, height / 2, radius, 0 * deg, 360 * deg);
                cairo_fill(cairo);
-       } else {
-               struct rounded_corner_ctx rounded_ctx = {
-                       .box = &(struct wlr_box) { .width = width, .height = height },
-                       .radius = rc.corner_radius,
-                       .line_width = theme->border_width,
-                       .fill_color = overlay_color,
-                       .border_color = overlay_color,
-                       .corner = corner
-               };
-               struct lab_data_buffer *overlay_buffer = rounded_rect(&rounded_ctx);
-               cairo_set_source_surface(cairo,
-                       cairo_get_target(overlay_buffer->cairo), 0, 0);
-               cairo_paint(cairo);
-               wlr_buffer_drop(&overlay_buffer->base);
+               break;
+       case LAB_RECTANGLE:
+               if (corner == LAB_CORNER_UNKNOWN) {
+                       set_cairo_color(cairo, overlay_color);
+                       cairo_rectangle(cairo, 0, 0, width, height);
+                       cairo_fill(cairo);
+               } else {
+                       struct rounded_corner_ctx rounded_ctx = {
+                               .box = &(struct wlr_box){.width = width, .height = height},
+                               .radius = rc.corner_radius,
+                               .line_width = theme->border_width,
+                               .fill_color = overlay_color,
+                               .border_color = overlay_color,
+                               .corner = corner};
+                       struct lab_data_buffer *overlay_buffer =
+                               rounded_rect(&rounded_ctx);
+                       cairo_set_source_surface(cairo,
+                               cairo_get_target(overlay_buffer->cairo), 0, 0);
+                       cairo_paint(cairo);
+                       wlr_buffer_drop(&overlay_buffer->base);
+               }
+               break;
        }
        cairo_surface_flush(surf);
 
@@ -532,6 +545,18 @@ parse_justification(const char *str)
        }
 }
 
+static enum lab_shape
+parse_shape(const char *str)
+{
+       if (!strcasecmp(str, "Rectangle")) {
+               return LAB_RECTANGLE;
+       } else if (!strcasecmp(str, "Circle")) {
+               return LAB_CIRCLE;
+       } else {
+               return LAB_RECTANGLE;
+       }
+}
+
 /*
  * We generally use Openbox defaults, but if no theme file can be found it's
  * better to populate the theme variables with some sane values as no-one
@@ -569,6 +594,7 @@ theme_builtin(struct theme *theme, struct server *server)
        theme->padding_width = 0;
        theme->window_button_width = 26;
        theme->window_button_spacing = 0;
+       theme->window_button_hover_bg_shape = LAB_RECTANGLE;
 
        parse_hexstr("#000000",
                theme->window_active_button_menu_unpressed_image_color);
@@ -774,6 +800,9 @@ entry(struct theme *theme, const char *key, const char *value)
                theme->window_button_spacing = get_int_if_positive(
                        value, "window.button.spacing");
        }
+       if (match_glob(key, "window.button.hover.bg.shape")) {
+               theme->window_button_hover_bg_shape = parse_shape(value);
+       }
 
        /* universal button */
        if (match_glob(key, "window.active.button.unpressed.image.color")) {
@@ -1077,9 +1106,6 @@ theme_read(struct theme *theme, struct wl_list *paths)
 static struct lab_data_buffer *
 rounded_rect(struct rounded_corner_ctx *ctx)
 {
-       /* 1 degree in radians (=2π/360) */
-       double deg = 0.017453292519943295;
-
        if (ctx->corner == LAB_CORNER_UNKNOWN) {
                return NULL;
        }