summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDom Lachowicz <domlachowicz@gmail.com>2007-05-09 17:24:34 +0000
committerDom Lachowicz <doml@src.gnome.org>2007-05-09 17:24:34 +0000
commit73425733306b12fe84396a2b0354a91b85a0f194 (patch)
tree9181c49fd47a667347782664f927501720960c41
parente098ab04f99fe60b1d6e1fc8c698dc7fecd35d1b (diff)
downloadgdk-pixbuf-73425733306b12fe84396a2b0354a91b85a0f194.tar.gz
Merge from trunk:
2007-05-09 Dom Lachowicz <domlachowicz@gmail.com> Merge from trunk: * modules/engines/ms-windows/Theme/gtk-2.0/gtkrc: GtkTreeView doesn't expand/collapse with Right/Left cursor keys on Windows (#436269, Daniel Atallah) svn path=/branches/gtk-2-10/; revision=17811
-rw-r--r--ChangeLog8
-rwxr-xr-xmodules/engines/ms-windows/Theme/gtk-2.0/gtkrc13
2 files changed, 20 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bfa19a779..cf4bc1e31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-09 Dom Lachowicz <domlachowicz@gmail.com>
+
+ Merge from trunk:
+
+ * modules/engines/ms-windows/Theme/gtk-2.0/gtkrc: GtkTreeView doesn't
+ expand/collapse with Right/Left cursor keys on Windows
+ (#436269, Daniel Atallah)
+
2007-05-09 Cody Russell <bratsche@gnome.org>
Merge from trunk:
diff --git a/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc b/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
index 39f2a7b14..a5406a750 100755
--- a/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
+++ b/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
@@ -11,6 +11,9 @@ gtk-menu-images = 1
# use the win32 button ordering instead of the GNOME HIG one, where applicable
gtk-alternative-button-order = 1
+# use the win32 sort indicators direction, as in Explorer
+gtk-alternative-sort-arrows = 1
+
style "msw-default"
{
GtkWidget::interior-focus = 1
@@ -40,4 +43,12 @@ style "msw-default"
{
}
}
-class "*" style "msw-default" \ No newline at end of file
+class "*" style "msw-default"
+
+binding "ms-windows-tree-view"
+{
+ bind "Right" { "expand-collapse-cursor-row" (1,1,0) }
+ bind "Left" { "expand-collapse-cursor-row" (1,0,0) }
+}
+
+class "GtkTreeView" binding "ms-windows-tree-view"