From: Paul Cornett <paulcor@bullseye.com>
Date: Sat, 12 Nov 2011 16:50:37 +0000 (+0000)
Subject: position expander in center of given rectangle
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5ede3d24c873e25f5985f49604721ab2686be153

position expander in center of given rectangle

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index 7834a39047..248c9f7c47 100644
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -256,8 +256,7 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win,
     if (win->GetLayoutDirection() == wxLayout_RightToLeft)
         x_diff = rect.width;
 
-    // VZ: I don't know how to get the size of the expander so as to centre it
-    //     in the given rectangle, +2/3 below is just what looks good here...
+    // x and y parameters specify the center of the expander
     gtk_paint_expander
     (
         gtk_widget_get_style(tree),
@@ -266,8 +265,8 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win,
         NULL,
         tree,
         "treeview",
-        dc.LogicalToDeviceX(rect.x) + 6 - x_diff,
-        dc.LogicalToDeviceY(rect.y) + 3,
+        dc.LogicalToDeviceX(rect.x) + rect.width / 2 - x_diff,
+        dc.LogicalToDeviceY(rect.y) + rect.height / 2,
         flags & wxCONTROL_EXPANDED ? GTK_EXPANDER_EXPANDED
                                    : GTK_EXPANDER_COLLAPSED
     );