Merge pull request #2714 from saivert/rendering_code_fixes

Listview header render code and get_tab_under_cursor fix
DeaDBeeF-Player · Dec 2, 2021 · ad731f4 · ad731f4
2 parents 3b78bcc + 690b4dc
commit ad731f4
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 11 deletions.
diff --git a/plugins/gtkui/ddblistview.c b/plugins/gtkui/ddblistview.c
@@ -2505,15 +2505,25 @@ ddb_listview_header_render (DdbListview *ps, cairo_t *cr, int x1, int x2) {
     draw_begin(&ps->hdrctx, cr);
     int h = a.height;
 
+    GtkStyle *style = gtk_widget_get_style(mainwin);
     // Paint the background for the whole header
     GdkColor gdkfg;
 #if !GTK_HEADERS
-    GdkColor clr;
-    gtkui_get_tabstrip_base_color(&clr);
-    draw_cairo_rectangle(cr, &clr, 0, 0, a.width, h);
-    gtkui_get_tabstrip_dark_color(&clr);
-    draw_cairo_line(cr, &clr, 0, h, a.width, h);
-    gtkui_get_listview_column_text_color(&gdkfg);
+    GdkColor clr_base, clr_dark, clr_light;
+    if (gtkui_override_tabstrip_colors()) {
+        gtkui_get_tabstrip_base_color(&clr_base);
+        gtkui_get_tabstrip_dark_color(&clr_dark);
+        gtkui_get_tabstrip_light_color (&clr_light);
+        gtkui_get_listview_column_text_color(&gdkfg);
+    } else {
+        clr_base = style->bg[GTK_STATE_NORMAL];
+        clr_dark = style->dark[GTK_STATE_NORMAL];
+        clr_light = style->light[GTK_STATE_NORMAL];
+        gdkfg = style->fg[GTK_STATE_NORMAL];
+    }
+
+    draw_cairo_rectangle(cr, &clr_base, 0, 0, a.width, h);
+    draw_cairo_line(cr, &clr_dark, 0, h, a.width, h);
     draw_cairo_line(cr, &gtk_widget_get_style(ps->header)->mid[GTK_STATE_NORMAL], 0, h, a.width, h);
 #else
 #if GTK_CHECK_VERSION(3,0,0)
@@ -2537,11 +2547,8 @@ ddb_listview_header_render (DdbListview *ps, cairo_t *cr, int x1, int x2) {
 
             // Add a vertical line near the right side of the column width, but not right next to an empty slot
             if (c->width > 0 && ps->header_dragging != idx + 1) {
-                GdkColor clr;
-                gtkui_get_tabstrip_dark_color (&clr);
-                draw_cairo_line(cr, &clr, xx-2, 2, xx-2, h-4);
-                gtkui_get_tabstrip_light_color (&clr);
-                draw_cairo_line(cr, &clr, xx-1, 2, xx-1, h-4);
+                draw_cairo_line(cr, &clr_dark, xx-2, 2, xx-2, h-4);
+                draw_cairo_line(cr, &clr_light, xx-1, 2, xx-1, h-4);
             }
         }
         x = xx;

diff --git a/plugins/gtkui/ddbtabstrip.c b/plugins/gtkui/ddbtabstrip.c
@@ -937,6 +937,17 @@ static int
 get_tab_under_cursor (DdbTabStrip *ts, int x) {
     int hscroll = ts->hscrollpos;
     int need_arrows = tabstrip_need_arrows (ts);
+
+    GtkAllocation a;
+    int buttons_width = add_playlist_btn_width + (need_arrows ? arrow_widget_width : 0);
+    gtk_widget_get_allocation (GTK_WIDGET(ts), &a);
+    if (x > a.width - buttons_width) {
+        return -1;
+    }
+    if (need_arrows && x < arrow_widget_width) {
+        return -1;
+    }
+
     if (need_arrows) {
         hscroll -= arrow_widget_width;
     }