debian/midori
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Make Tab Panel use the correct foreground colours

Browse source 
In particular when used in combination with Colorful Tabs.
This commit is contained in:
Christian Dywan 2011-04-25 17:56:56 +02:00
parent f4ae255f9a
commit cd4cd3f52e
2 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
extensions/colorful-tabs.c
View file

@ -13,14 +13,23 @@
#include <midori/midori.h> #include <midori/midori.h>
static void static void
colorful_tabs_modify_fg (GtkWidget* child, colorful_tabs_modify_fg (GtkWidget* label,
GdkColor* color) GdkColor* color)
{ {
if (GTK_IS_LABEL (child)) GtkWidget* box = gtk_bin_get_child (GTK_BIN (label));
GList* children = gtk_container_get_children (GTK_CONTAINER (box));
for (; children != NULL; children = g_list_next (children))
{ {
gtk_widget_modify_fg (child, GTK_STATE_ACTIVE, color); if (GTK_IS_LABEL (children->data))
gtk_widget_modify_fg (child, GTK_STATE_NORMAL, color); {
gtk_widget_modify_fg (children->data, GTK_STATE_ACTIVE, color);
gtk_widget_modify_fg (children->data, GTK_STATE_NORMAL, color);
/* Also modify the label itself, for Tab Panel */
gtk_widget_modify_fg (label, GTK_STATE_NORMAL, color);
break;
}
} }
g_list_free (children);
} }
static void static void
@ -28,7 +37,6 @@ colorful_tabs_view_notify_uri_cb (MidoriView* view,
GParamSpec* pspec, GParamSpec* pspec,
MidoriExtension* extension) MidoriExtension* extension)
{ {
GtkWidget* box;
GtkWidget* label; GtkWidget* label;
SoupURI* uri; SoupURI* uri;
gchar* colorstr; gchar* colorstr;
@ -82,14 +90,9 @@ colorful_tabs_view_notify_uri_cb (MidoriView* view,
else else
gdk_color_parse ("#000", &fgcolor); gdk_color_parse ("#000", &fgcolor);
box = gtk_bin_get_child (GTK_BIN (label));
gtk_event_box_set_visible_window (GTK_EVENT_BOX (label), TRUE); gtk_event_box_set_visible_window (GTK_EVENT_BOX (label), TRUE);
gtk_container_foreach (GTK_CONTAINER (box), colorful_tabs_modify_fg (label, &fgcolor);
(GtkCallback) colorful_tabs_modify_fg,
&fgcolor);
gtk_widget_modify_bg (label, GTK_STATE_NORMAL, &color); gtk_widget_modify_bg (label, GTK_STATE_NORMAL, &color);
if (color.red < 10000) if (color.red < 10000)
@ -111,9 +114,7 @@ colorful_tabs_view_notify_uri_cb (MidoriView* view,
{ {
gtk_widget_modify_bg (label, GTK_STATE_NORMAL, NULL); gtk_widget_modify_bg (label, GTK_STATE_NORMAL, NULL);
gtk_widget_modify_bg (label, GTK_STATE_ACTIVE, NULL); gtk_widget_modify_bg (label, GTK_STATE_ACTIVE, NULL);
gtk_container_foreach (GTK_CONTAINER (gtk_bin_get_child (GTK_BIN (label))), colorful_tabs_modify_fg (label, NULL);
(GtkCallback) colorful_tabs_modify_fg,
NULL);
} }
} }
@ -153,9 +154,7 @@ colorful_tabs_deactivate_cb (MidoriExtension* extension,
gtk_event_box_set_visible_window (GTK_EVENT_BOX (label), FALSE); gtk_event_box_set_visible_window (GTK_EVENT_BOX (label), FALSE);
gtk_widget_modify_bg (label, GTK_STATE_NORMAL, NULL); gtk_widget_modify_bg (label, GTK_STATE_NORMAL, NULL);
gtk_widget_modify_bg (label, GTK_STATE_ACTIVE, NULL); gtk_widget_modify_bg (label, GTK_STATE_ACTIVE, NULL);
gtk_container_foreach (GTK_CONTAINER (gtk_bin_get_child (GTK_BIN (label))), colorful_tabs_modify_fg (label, NULL);
(GtkCallback) colorful_tabs_modify_fg,
NULL);
g_signal_handlers_disconnect_by_func ( g_signal_handlers_disconnect_by_func (
view, colorful_tabs_view_notify_uri_cb, extension); view, colorful_tabs_view_notify_uri_cb, extension);
} }

11
extensions/tab-panel.c
View file

@ -360,6 +360,7 @@ tab_panel_view_notify_icon_cb (GtkWidget* view,
gtk_tree_store_set (GTK_TREE_STORE (model), &iter, gtk_tree_store_set (GTK_TREE_STORE (model), &iter,
3, icon, 3, icon,
6, &style->bg[GTK_STATE_NORMAL], 6, &style->bg[GTK_STATE_NORMAL],
7, &style->fg[GTK_STATE_NORMAL],
-1); -1);
} }
} }
@ -452,7 +453,7 @@ tab_panel_browser_add_tab_cb (MidoriBrowser* browser,
gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), gtk_tree_store_insert_with_values (GTK_TREE_STORE (model),
&iter, NULL, page, 0, view, 1, GTK_STOCK_CLOSE, 2, buttons, &iter, NULL, page, 0, view, 1, GTK_STOCK_CLOSE, 2, buttons,
3, icon, 4, title, 5, ellipsize, 6, NULL, -1); 3, icon, 4, title, 5, ellipsize, 6, NULL, 7, NULL, -1);
} }
if (!g_signal_handler_find (view, G_SIGNAL_MATCH_FUNC, if (!g_signal_handler_find (view, G_SIGNAL_MATCH_FUNC,
@ -530,8 +531,9 @@ tab_panel_app_add_browser_cb (MidoriApp* app,
panel = katze_object_get_object (browser, "panel"); panel = katze_object_get_object (browser, "panel");
model = gtk_tree_store_new (7, MIDORI_TYPE_VIEW, model = gtk_tree_store_new (8, MIDORI_TYPE_VIEW,
G_TYPE_STRING, G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT, GDK_TYPE_COLOR); G_TYPE_STRING, G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF, G_TYPE_STRING,
G_TYPE_INT, GDK_TYPE_COLOR, GDK_TYPE_COLOR);
g_object_set_data (G_OBJECT (browser), "tab-panel-ext-model", model); g_object_set_data (G_OBJECT (browser), "tab-panel-ext-model", model);
treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
@ -549,7 +551,8 @@ tab_panel_app_add_browser_cb (MidoriApp* app,
renderer_text = gtk_cell_renderer_text_new (); renderer_text = gtk_cell_renderer_text_new ();
gtk_tree_view_column_pack_start (column, renderer_text, TRUE); gtk_tree_view_column_pack_start (column, renderer_text, TRUE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (column), renderer_text, gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (column), renderer_text,
"text", 4, "ellipsize", 5, "cell-background-gdk", 6, NULL); "text", 4, "ellipsize", 5,
"cell-background-gdk", 6, "foreground-gdk", 7, NULL);
gtk_tree_view_column_set_expand (column, TRUE); gtk_tree_view_column_set_expand (column, TRUE);
gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
column = gtk_tree_view_column_new (); column = gtk_tree_view_column_new ();