[maemo-commits] [maemo-commits] r9507 - in projects/haf/trunk/hildon-theme-layout-4: . rc
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Thu Feb 1 14:03:29 EET 2007
- Previous message: [maemo-commits] r9506 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk
- Next message: [maemo-commits] r9508 - in projects/haf/branches/hildon-libs/hildon-1: . src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: mdk Date: 2007-02-01 14:03:28 +0200 (Thu, 01 Feb 2007) New Revision: 9507 Modified: projects/haf/trunk/hildon-theme-layout-4/ChangeLog projects/haf/trunk/hildon-theme-layout-4/rc/gtkbutton.rc projects/haf/trunk/hildon-theme-layout-4/rc/gtktreeview.rc Log: Use the 'position' keyword instead of detail for sapwood 2.91.0. Patch by Tommi Komulainen. Fixes MB#973. Active/passive focus for gtk 2.10. Patch by Tommi Komulainen. Fixes MB#992. Modified: projects/haf/trunk/hildon-theme-layout-4/ChangeLog =================================================================== --- projects/haf/trunk/hildon-theme-layout-4/ChangeLog 2007-02-01 11:36:48 UTC (rev 9506) +++ projects/haf/trunk/hildon-theme-layout-4/ChangeLog 2007-02-01 12:03:28 UTC (rev 9507) @@ -1,3 +1,11 @@ +2007-02-01 Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com> + + * rc/gtkbutton.rc: Use the 'position' keyword instead of detail for + sapwood 2.91.0. Patch by Tommi Komulainen. Fixes MB#973. + + * rc/gtktreeview.rc: Active/passive focus for gtk 2.10. Patch by Tommi + Komulainen. Fixes MB#992. + 2007-01-31 Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com> * rc/gtkcheckbutton.rc: Removing the check focus that overdraws Modified: projects/haf/trunk/hildon-theme-layout-4/rc/gtkbutton.rc =================================================================== --- projects/haf/trunk/hildon-theme-layout-4/rc/gtkbutton.rc 2007-02-01 11:36:48 UTC (rev 9506) +++ projects/haf/trunk/hildon-theme-layout-4/rc/gtkbutton.rc 2007-02-01 12:03:28 UTC (rev 9507) @@ -914,7 +914,7 @@ image { function = BOX state = ACTIVE - detail = "osso_button_ns" + position = TOP, BOTTOM file = "../images/qgn_plat_dialog_button_middle_pressed.png" border = { 20, 20, 0, 0 } stretch = TRUE @@ -922,7 +922,7 @@ image { function = BOX state = INSENSITIVE - detail = "osso_button_ns" + position = TOP, BOTTOM file = "../images/qgn_plat_dialog_button_middle_disabled.png" border = { 20, 20, 0, 0 } stretch = TRUE @@ -930,14 +930,14 @@ image { function = BOX state = SELECTED - detail = "osso_button_ns" + position = TOP, BOTTOM file = "../images/qgn_plat_dialog_button_middle_focused.png" border = { 20, 20, 0, 0 } stretch = TRUE } image { function = BOX - detail = "osso_button_ns" + position = TOP, BOTTOM file = "../images/qgn_plat_dialog_button_middle_normal.png" border = { 20, 20, 0, 0 } stretch = TRUE @@ -945,14 +945,14 @@ image { function = FOCUS state = ACTIVE - detail = "osso_button_ns" + position = TOP, BOTTOM file = "../images/qgn_plat_dialog_button_middle_focused_pressed.png" border = { 20, 20, 0, 0} stretch = TRUE } image { function = FOCUS - detail = "osso_button_ns" + position = TOP, BOTTOM file = "../images/qgn_plat_dialog_button_middle_focused.png" border = { 20, 20, 0, 0 } stretch = TRUE @@ -961,7 +961,7 @@ image { function = BOX state = ACTIVE - detail = "osso_button_nsw" + position = TOP, LEFT, BOTTOM file = "../images/qgn_plat_dialog_button_left_pressed.png" border = { 20, 20, 0, 0 } stretch = TRUE @@ -969,7 +969,7 @@ image { function = BOX state = INSENSITIVE - detail = "osso_button_nsw" + position = TOP, LEFT, BOTTOM file = "../images/qgn_plat_dialog_button_left_disabled.png" border = { 20, 20, 0, 0 } stretch = TRUE @@ -977,14 +977,14 @@ image { function = BOX state = SELECTED - detail = "osso_button_nsw" + position = TOP, LEFT, BOTTOM file = "../images/qgn_plat_dialog_button_left_focused.png" border = { 20, 20, 0, 0 } stretch = TRUE } image { function = BOX - detail = "osso_button_nsw" + position = TOP, LEFT, BOTTOM file = "../images/qgn_plat_dialog_button_left_normal.png" border = { 20, 20, 0, 0 } stretch = TRUE @@ -992,14 +992,14 @@ image { function = FOCUS state = ACTIVE - detail = "osso_button_nsw" + position = TOP, LEFT, BOTTOM file = "../images/qgn_plat_dialog_button_left_focused_pressed.png" border = { 20, 20, 0, 0 } stretch = TRUE } image { function = FOCUS - detail = "osso_button_nsw" + position = TOP, LEFT, BOTTOM file = "../images/qgn_plat_dialog_button_left_focused.png" border = { 20, 20, 0, 0 } stretch = TRUE @@ -1009,7 +1009,7 @@ image { function = BOX state = ACTIVE - detail = "osso_button_nes" + position = TOP, RIGHT, BOTTOM file = "../images/qgn_plat_dialog_button_right_pressed.png" border = { 20, 20, 0, 0 } stretch = TRUE @@ -1017,7 +1017,7 @@ image { function = BOX state = INSENSITIVE - detail = "osso_button_nes" + position = TOP, RIGHT, BOTTOM file = "../images/qgn_plat_dialog_button_right_disabled.png" border = { 20, 20, 0, 0 } stretch = TRUE @@ -1025,14 +1025,14 @@ image { function = BOX state = SELECTED - detail = "osso_button_nes" + position = TOP, RIGHT, BOTTOM file = "../images/qgn_plat_dialog_button_right_focused.png" border = { 20, 20, 0, 0 } stretch = TRUE } image { function = BOX - detail = "osso_button_nes" + position = TOP, RIGHT, BOTTOM file = "../images/qgn_plat_dialog_button_right_normal.png" border = { 20, 20, 0, 0 } stretch = TRUE @@ -1040,14 +1040,14 @@ image { function = FOCUS state = ACTIVE - detail = "osso_button_nes" + position = TOP, RIGHT, BOTTOM file = "../images/qgn_plat_dialog_button_right_focused_pressed.png" border = { 20, 20, 0, 0 } stretch = TRUE } image { function = FOCUS - detail = "osso_button_nes" + position = TOP, RIGHT, BOTTOM file = "../images/qgn_plat_dialog_button_right_focused.png" border = { 20, 20, 0, 0 } stretch = TRUE @@ -1056,7 +1056,7 @@ image { function = BOX state = ACTIVE - detail = "osso_button_nesw" + position = LEFT, TOP, RIGHT, BOTTOM file = "../images/qgn_plat_dialog_button_alone_pressed.png" border = { 20, 20, 0, 0 } stretch = TRUE @@ -1064,7 +1064,7 @@ image { function = BOX state = INSENSITIVE - detail = "osso_button_nesw" + position = LEFT, TOP, RIGHT, BOTTOM file = "../images/qgn_plat_dialog_button_alone_disabled.png" border = { 20, 20, 0, 0 } stretch = TRUE @@ -1072,14 +1072,14 @@ image { function = BOX state = SELECTED - detail = "osso_button_nesw" + position = LEFT, TOP, RIGHT, BOTTOM file = "../images/qgn_plat_dialog_button_alone_focused.png" border = { 20, 20, 0, 0 } stretch = TRUE } image { function = BOX - detail = "osso_button_nesw" + position = LEFT, TOP, RIGHT, BOTTOM file = "../images/qgn_plat_dialog_button_alone_normal.png" border = { 20, 20, 0, 0 } stretch = TRUE @@ -1087,14 +1087,14 @@ image { function = FOCUS state = ACTIVE - detail = "osso_button_nesw" + position = LEFT, TOP, RIGHT, BOTTOM file = "../images/qgn_plat_dialog_button_alone_focused_pressed.png" border = { 20, 20, 0, 0 } stretch = TRUE } image { function = FOCUS - detail = "osso_button_nesw" + position = LEFT, TOP, RIGHT, BOTTOM file = "../images/qgn_plat_dialog_button_alone_focused.png" border = { 20, 20, 0, 0 } stretch = TRUE Modified: projects/haf/trunk/hildon-theme-layout-4/rc/gtktreeview.rc =================================================================== --- projects/haf/trunk/hildon-theme-layout-4/rc/gtktreeview.rc 2007-02-01 11:36:48 UTC (rev 9506) +++ projects/haf/trunk/hildon-theme-layout-4/rc/gtktreeview.rc 2007-02-01 12:03:28 UTC (rev 9507) @@ -12,7 +12,7 @@ GtkTreeView::expander-indent = 8 GtkTreeView::horizontal-separator = 6 GtkTreeView::vertical-separator = 2 - GtkTreeView::hildonlike = 1 + GtkTreeView::row-ending-details = 1 GtkTreeView::passive_focus = 1 GtkTreeView::separator-height = 15 @@ -163,11 +163,12 @@ overlay_border = { 0, 0, 0, 0 } overlay_stretch = FALSE } + # selection ####################################################### image { function = FLAT_BOX state = SELECTED - detail = "left" + detail = "*_start" file = "../images/qgn_plat_focus_left_selection.png" border = { 2, 0, 2, 2 } stretch = TRUE @@ -176,7 +177,7 @@ { function = FLAT_BOX state = SELECTED - detail = "middle" + detail = "*_middle" file = "../images/qgn_plat_focus_middle_selection.png" border = { 0, 0, 2, 2 } stretch = TRUE @@ -185,7 +186,7 @@ { function = FLAT_BOX state = SELECTED - detail = "right" + detail = "*_end" file = "../images/qgn_plat_focus_right_selection.png" border = { 0, 2, 2, 2 } stretch = TRUE @@ -194,45 +195,93 @@ { function = FLAT_BOX state = SELECTED - detail = "full" file = "../images/qgn_plat_focus_selection.png" border = { 2, 2, 2, 2 } stretch = TRUE } + # active focus #################################################### image { - function = FOCUS - detail = "left" + function = FLAT_BOX + state = ACTIVE + shadow = NONE + detail = "*_start" file = "../images/qgn_plat_focus_left_active.png" border = { 2, 0, 2, 2 } stretch = TRUE } image { - function = FOCUS - detail = "middle" + function = FLAT_BOX + state = ACTIVE + shadow = NONE + detail = "*_middle" file = "../images/qgn_plat_focus_middle_active.png" border = { 0, 0, 2, 2 } stretch = TRUE } image { - function = FOCUS - detail = "right" + function = FLAT_BOX + state = ACTIVE + shadow = NONE + detail = "*_end" file = "../images/qgn_plat_focus_right_active.png" border = { 0, 2, 2, 2 } stretch = TRUE } image { - function = FOCUS - detail = "full" + function = FLAT_BOX + state = ACTIVE + shadow = NONE file = "../images/qgn_plat_focus_active.png" border = { 2, 2, 2, 2 } stretch = TRUE } + # 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 } + stretch = TRUE + } + image + { + function = FLAT_BOX + state = ACTIVE + shadow = OUT + detail = "*_middle" + file = "../images/qgn_plat_focus_middle_passive.png" + border = { 0, 0, 2, 2 } + stretch = TRUE + } + image + { + function = FLAT_BOX + state = ACTIVE + shadow = OUT + detail = "*_end" + file = "../images/qgn_plat_focus_right_passive.png" + border = { 0, 2, 2, 2 } + stretch = TRUE + } + image + { + function = FLAT_BOX + state = ACTIVE + shadow = OUT + file = "../images/qgn_plat_focus_passive.png" + border = { 2, 2, 2, 2 } + stretch = TRUE + } + # drop indicator ################################################## + image + { function = FOCUS detail = "treeview-drop-indicator-left" file = "../images/qgn_plat_focus_left_active.png" @@ -309,48 +358,3 @@ } } widget_class "*.GtkTreeView.GtkButton.GtkHBox.GtkArrow" style "osso-treeviewcolumn-sortarrow" - - -################################ -# Passive focus to GtkTreeView -################################ - -style "osso-focus" -{ - engine "sapwood" - { - image - { - function = FOCUS - detail = "left" - file = "../images/qgn_plat_focus_left_passive.png" - border = { 2, 0, 2, 2 } - stretch = TRUE - } - image - { - function = FOCUS - detail = "middle" - file = "../images/qgn_plat_focus_middle_passive.png" - border = { 0, 0, 2, 2 } - stretch = TRUE - } - image - { - function = FOCUS - detail = "right" - file = "../images/qgn_plat_focus_right_passive.png" - border = { 0, 2, 2, 2 } - stretch = TRUE - } - image - { - function = FOCUS - detail = "full" - file = "../images/qgn_plat_focus_passive.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - } -} -widget "hildon-focus" style "osso-focus"
- Previous message: [maemo-commits] r9506 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk
- Next message: [maemo-commits] r9508 - in projects/haf/branches/hildon-libs/hildon-1: . src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]