From 8ba1f2630950b1b5fd73dc92c2e71d217947d2e7 Mon Sep 17 00:00:00 2001 From: o9000 Date: Tue, 14 Nov 2017 10:48:47 +0100 Subject: [PATCH] Taskbar: thumbnails --- src/tooltip/tooltip.c | 13 ++++--------- themes/tint2rc | 25 +++++++++++++++++++------ 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/tooltip/tooltip.c b/src/tooltip/tooltip.c index 90b6885..098da6e 100644 --- a/src/tooltip/tooltip.c +++ b/src/tooltip/tooltip.c @@ -335,21 +335,16 @@ void stop_tooltip_timeout() void tooltip_update_contents_for(Area *area) { - free(g_tooltip.tooltip_text); + free_and_null(g_tooltip.tooltip_text); + if (g_tooltip.image) + cairo_surface_destroy(g_tooltip.image); + g_tooltip.image = NULL; if (area && area->_get_tooltip_text) g_tooltip.tooltip_text = area->_get_tooltip_text(area); - else - g_tooltip.tooltip_text = NULL; if (area && area->_get_tooltip_image) { - if (g_tooltip.image) - cairo_surface_destroy(g_tooltip.image); g_tooltip.image = area->_get_tooltip_image(area); if (g_tooltip.image) cairo_surface_reference(g_tooltip.image); - } else { - if (g_tooltip.image) - cairo_surface_destroy(g_tooltip.image); - g_tooltip.image = NULL; } g_tooltip.area = area; } diff --git a/themes/tint2rc b/themes/tint2rc index eda90e6..f41db8d 100644 --- a/themes/tint2rc +++ b/themes/tint2rc @@ -1,11 +1,14 @@ -#---- Generated by tint2conf 2641 ---- +#---- Generated by tint2conf d8b1 ---- # See https://gitlab.com/o9000/tint2/wikis/Configure for # full documentation of the configuration options. #------------------------------------- +# Gradients +#------------------------------------- # Backgrounds # Background 1: Panel rounded = 0 border_width = 0 +border_sides = TBLR background_color = #000000 60 border_color = #000000 30 background_color_hover = #000000 60 @@ -16,6 +19,7 @@ border_color_pressed = #000000 30 # Background 2: Default task, Iconified task rounded = 4 border_width = 1 +border_sides = TBLR background_color = #777777 20 border_color = #777777 30 background_color_hover = #aaaaaa 22 @@ -26,6 +30,7 @@ border_color_pressed = #eaeaea 44 # Background 3: Active task rounded = 4 border_width = 1 +border_sides = TBLR background_color = #777777 20 border_color = #ffffff 40 background_color_hover = #aaaaaa 22 @@ -36,6 +41,7 @@ border_color_pressed = #eaeaea 44 # Background 4: Urgent task rounded = 4 border_width = 1 +border_sides = TBLR background_color = #aa4400 100 border_color = #aa7733 100 background_color_hover = #cc7700 100 @@ -46,8 +52,9 @@ border_color_pressed = #aa7733 100 # Background 5: Tooltip rounded = 1 border_width = 1 -background_color = #ffffaa 100 -border_color = #000000 100 +border_sides = TBLR +background_color = #222222 100 +border_color = #333333 100 background_color_hover = #ffffaa 100 border_color_hover = #000000 100 background_color_pressed = #ffffaa 100 @@ -65,7 +72,7 @@ panel_dock = 0 panel_position = bottom center horizontal panel_layer = top panel_monitor = all -primary_monitor_first = 0 +panel_shrink = 0 autohide = 0 autohide_show_timeout = 0 autohide_hide_timeout = 0.5 @@ -81,12 +88,14 @@ mouse_pressed_icon_asb = 100 0 0 #------------------------------------- # Taskbar taskbar_mode = single_desktop +taskbar_hide_if_empty = 0 taskbar_padding = 0 0 2 taskbar_background_id = 0 taskbar_active_background_id = 0 taskbar_name = 1 taskbar_hide_inactive_tasks = 0 taskbar_hide_different_monitor = 0 +taskbar_hide_different_desktop = 0 taskbar_always_show_all_desktop_tasks = 0 taskbar_name_padding = 4 2 taskbar_name_background_id = 0 @@ -125,6 +134,7 @@ systray_sort = ascending systray_icon_size = 24 systray_icon_asb = 100 0 0 systray_monitor = 1 +systray_name_filter = #------------------------------------- # Launcher @@ -164,7 +174,10 @@ clock_dwheel_command = battery_tooltip = 1 battery_low_status = 10 battery_low_cmd = notify-send "battery low" +battery_full_cmd = battery_font_color = #ffffff 100 +bat1_format = +bat2_format = battery_padding = 1 0 battery_background_id = 0 battery_hide = 101 @@ -180,7 +193,7 @@ ac_disconnected_cmd = # Tooltip tooltip_show_timeout = 0.5 tooltip_hide_timeout = 0.1 -tooltip_padding = 2 2 +tooltip_padding = 4 4 tooltip_background_id = 5 -tooltip_font_color = #222222 100 +tooltip_font_color = #dddddd 100