[nautilus] icon-container: remove unused code caching canvas item colors
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] icon-container: remove unused code caching canvas item colors
- Date: Wed, 7 Sep 2011 18:38:48 +0000 (UTC)
commit 77eecef417b91bb0c48588513de473f11a5c9896
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Wed Sep 7 14:35:58 2011 -0400
icon-container: remove unused code caching canvas item colors
Caching colors in NautilusIconContainer to use them in the canvas item
is not needed anymore, as gtk_render_* fetches the right values directly
from the style context.
libnautilus-private/nautilus-icon-container.c | 128 -------------------------
libnautilus-private/nautilus-icon-private.h | 16 ---
2 files changed, 0 insertions(+), 144 deletions(-)
---
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index 8448eec..3e5c09d 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -147,7 +147,6 @@ static void preview_selected_items (NautilusIco
static void activate_selected_items (NautilusIconContainer *container);
static void activate_selected_items_alternate (NautilusIconContainer *container,
NautilusIcon *icon);
-static void nautilus_icon_container_theme_changed (gpointer user_data);
static void compute_stretch (StretchState *start,
StretchState *current);
static NautilusIcon *get_first_selected_icon (NautilusIconContainer *container);
@@ -171,7 +170,6 @@ static inline void icon_get_bounding_box (NautilusIco
static gboolean is_renaming (NautilusIconContainer *container);
static gboolean is_renaming_pending (NautilusIconContainer *container);
static void process_pending_icon_to_rename (NautilusIconContainer *container);
-static void setup_label_gcs (NautilusIconContainer *container);
static void nautilus_icon_container_stop_monitor_top_left (NautilusIconContainer *container,
NautilusIconData *data,
gconstpointer client);
@@ -4217,7 +4215,6 @@ realize (GtkWidget *widget)
nautilus_icon_dnd_init (container);
setup_background (container);
- setup_label_gcs (container);
hadj = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (widget));
g_signal_connect (hadj, "value_changed",
@@ -4261,8 +4258,6 @@ style_updated (GtkWidget *widget)
GTK_WIDGET_CLASS (nautilus_icon_container_parent_class)->style_updated (widget);
}
- nautilus_icon_container_theme_changed (NAUTILUS_ICON_CONTAINER (widget));
-
if (gtk_widget_get_realized (widget)) {
invalidate_label_sizes (container);
nautilus_icon_container_request_update_all (container);
@@ -6230,9 +6225,6 @@ nautilus_icon_container_init (NautilusIconContainer *container)
g_signal_connect (container, "focus-out-event",
G_CALLBACK (handle_focus_out_event), NULL);
- /* read in theme-dependent data */
- nautilus_icon_container_theme_changed (container);
-
if (!setup_prefs) {
g_signal_connect_swapped (nautilus_icon_view_preferences,
"changed::" NAUTILUS_PREFERENCES_ICON_VIEW_TEXT_ELLIPSIS_LIMIT,
@@ -8430,101 +8422,6 @@ nautilus_icon_container_set_single_click_mode (NautilusIconContainer *container,
container->details->single_click_mode = single_click_mode;
}
-
-/* update the label color when the background changes */
-
-void
-nautilus_icon_container_get_label_color (NautilusIconContainer *container,
- GdkRGBA *color,
- gboolean is_name,
- gboolean is_highlight,
- gboolean is_prelit)
-{
- int idx;
-
- if (is_name) {
- if (is_highlight) {
- if (gtk_widget_has_focus (GTK_WIDGET (container))) {
- idx = LABEL_COLOR_HIGHLIGHT;
- } else {
- idx = LABEL_COLOR_ACTIVE;
- }
- } else {
- if (is_prelit) {
- idx = LABEL_COLOR_PRELIGHT;
- } else {
- idx = LABEL_COLOR;
- }
- }
- } else {
- if (is_highlight) {
- if (gtk_widget_has_focus (GTK_WIDGET (container))) {
- idx = LABEL_INFO_COLOR_HIGHLIGHT;
- } else {
- idx = LABEL_INFO_COLOR_ACTIVE;
- }
- } else {
- idx = LABEL_INFO_COLOR;
- }
- }
-
- if (color) {
- *color = container->details->label_colors[idx];
- }
-}
-
-static void
-setup_gc_with_fg (NautilusIconContainer *container, int idx, GdkRGBA *color)
-{
- container->details->label_colors[idx] = *color;
-}
-
-static void
-setup_label_gcs (NautilusIconContainer *container)
-{
- GtkWidget *widget;
- GtkStyleContext *style;
- GdkRGBA color;
-
- if (!gtk_widget_get_realized (GTK_WIDGET (container)))
- return;
-
- widget = GTK_WIDGET (container);
-
- g_assert (NAUTILUS_IS_ICON_CONTAINER (container));
-
- /* read the info colors from the current theme; use a reasonable default if undefined */
- style = gtk_widget_get_style_context (widget);
-
- gtk_style_context_get_color (style,
- GTK_STATE_FLAG_SELECTED,
- &color);
- setup_gc_with_fg (container, LABEL_COLOR_HIGHLIGHT, &color);
- setup_gc_with_fg (container, LABEL_INFO_COLOR_HIGHLIGHT, &color);
-
-
- gtk_style_context_get_color (style, GTK_STATE_FLAG_ACTIVE, &color);
- setup_gc_with_fg (container, LABEL_COLOR_ACTIVE, &color);
- setup_gc_with_fg (container, LABEL_INFO_COLOR_ACTIVE, &color);
-
- gtk_style_context_get_color (style, GTK_STATE_FLAG_PRELIGHT, &color);
- setup_gc_with_fg (container, LABEL_COLOR_PRELIGHT, &color);
-
- gtk_style_context_get_color (style, GTK_STATE_FLAG_INSENSITIVE, &color);
- setup_gc_with_fg (container, LABEL_INFO_COLOR,
- &color);
-
- if (!nautilus_icon_container_get_is_desktop (container)) {
- gtk_style_context_get_color (style, GTK_STATE_FLAG_NORMAL, &color);
- setup_gc_with_fg (container, LABEL_COLOR, &color);
- } else {
- GdkRGBA tmp;
-
- gdk_rgba_parse (&tmp, "#EFEFEF");
- setup_gc_with_fg (container, LABEL_COLOR, &tmp);
- }
-}
-
/* Return if the icon container is a fixed size */
gboolean
nautilus_icon_container_get_is_fixed_size (NautilusIconContainer *container)
@@ -8594,31 +8491,6 @@ nautilus_icon_container_set_use_drop_shadows (NautilusIconContainer *container,
/* handle theme changes */
-static void
-nautilus_icon_container_theme_changed (gpointer user_data)
-{
- NautilusIconContainer *container;
- GtkStyleContext *style;
- GdkRGBA color;
-
- container = NAUTILUS_ICON_CONTAINER (user_data);
- style = gtk_widget_get_style_context (GTK_WIDGET (container));
-
- gtk_style_context_get_background_color (style, GTK_STATE_FLAG_SELECTED, &color);
- container->details->highlight_color_rgba = color;
-
- gtk_style_context_get_background_color (style, GTK_STATE_FLAG_ACTIVE, &color);
- container->details->active_color_rgba = color;
-
- gtk_style_context_get_background_color (style, GTK_STATE_FLAG_PRELIGHT, &color);
- container->details->prelight_color_rgba = color;
-
- gtk_style_context_get_background_color (style, GTK_STATE_FLAG_NORMAL, &color);
- container->details->normal_color_rgba = color;
-
- setup_label_gcs (container);
-}
-
void
nautilus_icon_container_set_font (NautilusIconContainer *container,
const char *font)
diff --git a/libnautilus-private/nautilus-icon-private.h b/libnautilus-private/nautilus-icon-private.h
index 9298d10..405e2b6 100644
--- a/libnautilus-private/nautilus-icon-private.h
+++ b/libnautilus-private/nautilus-icon-private.h
@@ -203,15 +203,6 @@ struct NautilusIconContainerDetails {
/* font sizes used to draw labels */
int font_size_table[NAUTILUS_ZOOM_LEVEL_LARGEST + 1];
- /* pixbuf and color for label highlighting */
- GdkRGBA highlight_color_rgba;
- GdkRGBA active_color_rgba;
- GdkRGBA normal_color_rgba;
- GdkRGBA prelight_color_rgba;
-
- /* colors for text labels */
- GdkRGBA label_colors [LAST_LABEL_COLOR];
-
/* State used so arrow keys don't wander if icons aren't lined up.
*/
int arrow_key_start_x;
@@ -315,11 +306,4 @@ gboolean nautilus_icon_container_scroll (NautilusIconC
int delta_y);
void nautilus_icon_container_update_scroll_region (NautilusIconContainer *container);
-/* label color for items */
-void nautilus_icon_container_get_label_color (NautilusIconContainer *container,
- GdkRGBA *color,
- gboolean first_line,
- gboolean needs_highlight,
- gboolean is_prelit);
-
#endif /* NAUTILUS_ICON_CONTAINER_PRIVATE_H */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]