Merge lp:~junrrein/pantheon-files/remove-underlining into lp:~elementary-apps/pantheon-files/trunk

[Julián Unrrein]

Don't underline item names when hovering them. Fix bug #1012810 and bug #1193345.

Don't underline item names when hovering them. Fix bugs #1012810 and #1193345.

This affects Icon and List views.

[Cody Garver (codygarver)]

review: Approve

=== modified file 'src/fm-abstract-icon-view.c'
--- src/fm-abstract-icon-view.c	2013-06-01 20:18:10 +0000
+++ src/fm-abstract-icon-view.c	2013-06-30 22:38:26 +0000
@@ -767,8 +767,6 @@
     g_settings_bind (settings, "single-click", 
                      view->icons, "single-click", 0);
     g_settings_bind (settings, "single-click", 
-                     FM_DIRECTORY_VIEW (view)->name_renderer, "follow-prelit", 0); 
-    g_settings_bind (settings, "single-click", 
                      FM_DIRECTORY_VIEW (view)->icon_renderer, "selection-helpers", 0);
 
     g_signal_connect_object (view->icons, "button-press-event",

=== modified file 'src/fm-list-view.c'
--- src/fm-list-view.c	2013-06-13 23:56:30 +0000
+++ src/fm-list-view.c	2013-06-30 22:38:26 +0000
@@ -541,7 +541,6 @@
     GdkRGBA rgba;
 
     GtkTreePath *path, *hover_path;
-    PangoUnderline underline;
 
     gtk_tree_model_get (model, iter,
                         FM_LIST_MODEL_FILENAME, &text,
@@ -564,23 +563,9 @@
       }
       g_free (color);*/
 
-	underline = PANGO_UNDERLINE_NONE;
-    if (exo_tree_view_get_single_click (EXO_TREE_VIEW (view->tree))) {
-		path = gtk_tree_model_get_path (model, iter);
-        hover_path = exo_tree_view_get_hover_path (EXO_TREE_VIEW (view->tree));
-
-		if (hover_path == NULL || gtk_tree_path_compare (path, hover_path)) {
-			underline = PANGO_UNDERLINE_NONE;
-		} else {
-			underline = PANGO_UNDERLINE_SINGLE;
-		}
-
-		gtk_tree_path_free (path);
-	}
-
     g_object_set (G_OBJECT (renderer),
                   "text", text,
-                  "underline", underline,
+                  "underline", PANGO_UNDERLINE_NONE,
                   //"cell-background", color,
                   "cell-background-rgba", &rgba,
                   NULL);

=== modified file 'src/marlin-text-renderer.c'
--- src/marlin-text-renderer.c	2012-06-12 07:41:29 +0000
+++ src/marlin-text-renderer.c	2013-06-30 22:38:26 +0000
@@ -35,7 +35,6 @@
 enum
 {
     PROP_0,
-    PROP_FOLLOW_PRELIT,
     PROP_FOLLOW_STATE,
     PROP_TEXT,
     PROP_BACKGROUND,
@@ -126,20 +125,6 @@
     gtkcell_renderer_class->start_editing = marlin_text_renderer_start_editing;
 
     /**
-     * MarlinTextRenderer:follow-prelit:
-     *
-     * Whether to underline prelited cells. This is used for the single
-     * click support in the detailed list view.
-    **/
-    g_object_class_install_property (gobject_class,
-                                     PROP_FOLLOW_PRELIT,
-                                     g_param_spec_boolean ("follow-prelit",
-                                                           "follow-prelit",
-                                                           "follow-prelit",
-                                                           FALSE,
-                                                           EXO_PARAM_READWRITE));
-
-    /**
      * MarlinTextRenderer:follow-state:
      *
      * Specifies whether the text renderer should render text
@@ -282,10 +267,6 @@
 
     switch (prop_id)
     {
-    case PROP_FOLLOW_PRELIT:
-        g_value_set_boolean (value, text_renderer->follow_prelit);
-        break;
-
     case PROP_FOLLOW_STATE:
         g_value_set_boolean (value, text_renderer->follow_state);
         break;
@@ -329,10 +310,6 @@
 
     switch (prop_id)
     {
-    case PROP_FOLLOW_PRELIT:
-        text_renderer->follow_prelit = g_value_get_boolean (value);
-        break;
-
     case PROP_FOLLOW_STATE:
         text_renderer->follow_state = g_value_get_boolean (value);
         break;
@@ -509,17 +486,13 @@
     }
 
     /* render small/normal text depending on the zoom_level */
-    if (text_renderer->zoom_level < MARLIN_ZOOM_LEVEL_NORMAL) 
-    {
-        if (text_renderer->follow_prelit && (flags & GTK_CELL_RENDERER_PRELIT) != 0)
-            pango_layout_set_attributes (text_renderer->layout, eel_pango_attr_list_small_underline_single ());
-        else
-            pango_layout_set_attributes (text_renderer->layout, eel_pango_attr_list_small ());
-    } else {
-        if (text_renderer->follow_prelit && (flags & GTK_CELL_RENDERER_PRELIT) != 0)
-            pango_layout_set_attributes (text_renderer->layout, eel_pango_attr_list_underline_single ());
-        else
-            pango_layout_set_attributes (text_renderer->layout, NULL);
+    if (text_renderer->zoom_level < MARLIN_ZOOM_LEVEL_NORMAL)
+    {
+        pango_layout_set_attributes (text_renderer->layout, eel_pango_attr_list_small ());
+    }
+    else
+    {
+        pango_layout_set_attributes (text_renderer->layout, NULL);
     }
 
     /* setup the wrapping */

=== modified file 'src/marlin-text-renderer.h'
--- src/marlin-text-renderer.h	2011-08-09 18:11:55 +0000
+++ src/marlin-text-renderer.h	2013-06-30 22:38:26 +0000
@@ -60,9 +60,6 @@
     gint          focus_width;
     MarlinZoomLevel zoom_level;
 
-    /* underline prelited rows */
-    gboolean      follow_prelit;
-
     /* cell editing support */
     GtkWidget    *entry; 
     gboolean      entry_menu_active;