[maemo-commits] [maemo-commits] r13463 - in projects/haf/trunk/hildon-theme-layout-4: . rc

Wed Aug 29 15:29:29 EEST 2007

Author: mdk
Date: 2007-08-29 15:29:28 +0300 (Wed, 29 Aug 2007)
New Revision: 13463

Modified:
   projects/haf/trunk/hildon-theme-layout-4/ChangeLog
   projects/haf/trunk/hildon-theme-layout-4/rc/gtktreeview.rc
Log:
Applying a patch from Tommi Komulainen for new treeview focus handling. Fixes: NB#54874.


Modified: projects/haf/trunk/hildon-theme-layout-4/ChangeLog
===================================================================

--- projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-08-29 12:26:49 UTC (rev 13462)
+++ projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-08-29 12:29:28 UTC (rev 13463)
@@ -1,5 +1,10 @@
 2007-08-29  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
 
+	* rc/gtktreeview.rc: Applying a patch from Tommi Komulainen for new
+	treeview focus handling. Fixes: NB#54874.
+
+2007-08-29  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
+
 	* rc/ossomediaplayer.rc: update ossomediaplayer.rc to manage
 	the new ui layout update, related to new control images, new
 	playlist/current clip images and new tabs images. It embebed the

Modified: projects/haf/trunk/hildon-theme-layout-4/rc/gtktreeview.rc
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/rc/gtktreeview.rc	2007-08-29 12:26:49 UTC (rev 13462)
+++ projects/haf/trunk/hildon-theme-layout-4/rc/gtktreeview.rc	2007-08-29 12:29:28 UTC (rev 13463)
@@ -149,109 +149,125 @@
         overlay_file    = "../images/qgn_plat_check_box_empty_normal.png"
         overlay_stretch = FALSE
       }
-    # selection #######################################################
+    # selected row passive focus ######################################
     image
     {
       function = FLAT_BOX
       state    = SELECTED
+      shadow   = OUT
       detail   = "*_start"
+
       file = "../images/qgn_plat_focus_left_selection.png"
       border = { 2, 0, 2, 2 }
-    }
+
+      overlay_file = "../images/qgn_plat_focus_left_passive.png"
+      overlay_border = { 2, 0, 2, 2 }
+    }		
     image
     {
       function = FLAT_BOX
       state    = SELECTED
+      shadow   = OUT
       detail   = "*_middle"
+
       file = "../images/qgn_plat_focus_middle_selection.png"
       border = { 0, 0, 2, 2 }
-    }
+
+      overlay_file = "../images/qgn_plat_focus_middle_passive.png"
+      overlay_border = { 0, 0, 2, 2 }
+    }		
     image
     {
       function = FLAT_BOX
       state    = SELECTED
-      detail = "*_end"
+      shadow   = OUT
+      detail   = "*_end"
+
       file = "../images/qgn_plat_focus_right_selection.png"
       border = { 0, 2, 2, 2 }
-    }
+
+      overlay_file = "../images/qgn_plat_focus_right_passive.png"
+      overlay_border = { 0, 2, 2, 2 }
+    }		
     image
     {
       function = FLAT_BOX
       state    = SELECTED
+      shadow   = OUT
+
       file = "../images/qgn_plat_focus_selection.png"
       border = { 2, 2, 2, 2 }
-    }
-    # active focus ####################################################
+
+      overlay_file = "../images/qgn_plat_focus_passive.png"
+      overlay_border = { 2, 2, 2, 2 }
+    }		
+    # selection #######################################################
     image
     {
       function = FLAT_BOX
-      state    = ACTIVE
-      shadow   = NONE
+      state    = SELECTED
       detail   = "*_start"
-      file = "../images/qgn_plat_focus_left_active.png"
+      file = "../images/qgn_plat_focus_left_selection.png"
       border = { 2, 0, 2, 2 }
     }
     image
     {
       function = FLAT_BOX
-      state    = ACTIVE
-      shadow   = NONE
+      state    = SELECTED
       detail   = "*_middle"
-      file = "../images/qgn_plat_focus_middle_active.png"
+      file = "../images/qgn_plat_focus_middle_selection.png"
       border = { 0, 0, 2, 2 }
     }
     image
     {
       function = FLAT_BOX
-      state    = ACTIVE
-      shadow   = NONE
-      detail   = "*_end"
-      file = "../images/qgn_plat_focus_right_active.png"
+      state    = SELECTED
+      detail = "*_end"
+      file = "../images/qgn_plat_focus_right_selection.png"
       border = { 0, 2, 2, 2 }
     }
     image
     {
       function = FLAT_BOX
-      state    = ACTIVE
-      shadow   = NONE
-      file = "../images/qgn_plat_focus_active.png"
+      state    = SELECTED
+      file = "../images/qgn_plat_focus_selection.png"
       border = { 2, 2, 2, 2 }
     }
-    # passive focus ###################################################
+    # normal row passive focus ########################################
     image
     {
       function = FLAT_BOX
-      state    = ACTIVE
       shadow   = OUT
       detail   = "*_start"
-      file = "../images/qgn_plat_focus_left_passive.png"
-      border = { 2, 0, 2, 2 }
+
+      overlay_file = "../images/qgn_plat_focus_left_passive.png"
+      overlay_border = { 2, 0, 2, 2 }
     }		
     image
     {
       function = FLAT_BOX
-      state    = ACTIVE
       shadow   = OUT
       detail   = "*_middle"
-      file = "../images/qgn_plat_focus_middle_passive.png"
-      border = { 0, 0, 2, 2 }
+
+      overlay_file = "../images/qgn_plat_focus_middle_passive.png"
+      overlay_border = { 0, 0, 2, 2 }
     }		
     image
     {
       function = FLAT_BOX
-      state    = ACTIVE
       shadow   = OUT
       detail   = "*_end"
-      file = "../images/qgn_plat_focus_right_passive.png"
-      border = { 0, 2, 2, 2 }
+
+      overlay_file = "../images/qgn_plat_focus_right_passive.png"
+      overlay_border = { 0, 2, 2, 2 }
     }		
     image
     {
       function = FLAT_BOX
-      state    = ACTIVE
       shadow   = OUT
-      file = "../images/qgn_plat_focus_passive.png"
-      border = { 2, 2, 2, 2 }
+
+      overlay_file = "../images/qgn_plat_focus_passive.png"
+      overlay_border = { 2, 2, 2, 2 }
     }		
     # drop indicator ##################################################
     image
@@ -282,6 +298,34 @@
       file = "../images/qgn_plat_focus_active.png"
       border = { 2, 2, 2, 2 }
     }
+    # cursor ##########################################################
+    image
+    {
+      function = FOCUS
+      detail   = "*_start"
+      file = "../images/qgn_plat_focus_left_active.png"
+      border = { 2, 0, 2, 2 }
+    }
+    image
+    {
+      function = FOCUS
+      detail   = "*_middle"
+      file = "../images/qgn_plat_focus_middle_active.png"
+      border = { 0, 0, 2, 2 }
+    }
+    image
+    {
+      function = FOCUS
+      detail   = "*_end"
+      file = "../images/qgn_plat_focus_right_active.png"
+      border = { 0, 2, 2, 2 }
+    }
+    image
+    {
+      function = FOCUS
+      file = "../images/qgn_plat_focus_active.png"
+      border = { 2, 2, 2, 2 }
+    }
   }
 }
 


