(partially) fixed splitter sash rendering under GTK2

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

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index 17fb05abd1d3baf906fd8aa58407c8e5c4c22e9d..aa02feb1935a5fa4b989927b7e4e98d9d8838efe 100644 (file)
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -285,7 +285,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
 {
     if ( !win->m_wxwindow->window )
     {
 {
     if ( !win->m_wxwindow->window )
     {

-        // VZ: this happens on startup -- why?
+        // window not realized yet

         return;
     }
 
         return;
     }
 


@@ -296,12 +296,12 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
     GdkRectangle erase_rect;
     if ( isVert )
     {
     GdkRectangle erase_rect;
     if ( isVert )
     {

-    int h = win->GetClientSize().GetHeight();
+        int h = win->GetClientSize().GetHeight();

     
         rect.x = position;
     
         rect.x = position;

-        rect.y = h/2 - 14/2;
+        rect.y = 0;

         rect.width = SASH_FULL_SIZE;
         rect.width = SASH_FULL_SIZE;

-        rect.height = 14;
+        rect.height = h;

     
         erase_rect.x = position;
         erase_rect.y = 0;
     
         erase_rect.x = position;
         erase_rect.y = 0;


@@ -310,12 +310,12 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
     }
     else // horz
     {
     }
     else // horz
     {

-    int w = win->GetClientSize().GetWidth();
+        int w = win->GetClientSize().GetWidth();

     
     

-        rect.x = w/2 - 14/2;
+        rect.x = 0;

         rect.y = position;
         rect.height = SASH_FULL_SIZE;
         rect.y = position;
         rect.height = SASH_FULL_SIZE;

-        rect.width = 14;
+        rect.width = w;

     
         erase_rect.y = position;
         erase_rect.x = 0;
     
         erase_rect.y = position;
         erase_rect.x = 0;


@@ -356,7 +356,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
         rect.y,
         rect.width,
         rect.height,
         rect.y,
         rect.width,
         rect.height,

-        !isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL
+        isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL

     );
 #else // GTK+ 1.x
 
     );
 #else // GTK+ 1.x
 

diff --git a/src/gtk1/renderer.cpp b/src/gtk1/renderer.cpp
index 17fb05abd1d3baf906fd8aa58407c8e5c4c22e9d..aa02feb1935a5fa4b989927b7e4e98d9d8838efe 100644 (file)
--- a/src/gtk1/renderer.cpp
+++ b/src/gtk1/renderer.cpp
@@ -285,7 +285,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
 {
     if ( !win->m_wxwindow->window )
     {
 {
     if ( !win->m_wxwindow->window )
     {

-        // VZ: this happens on startup -- why?
+        // window not realized yet

         return;
     }
 
         return;
     }
 


@@ -296,12 +296,12 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
     GdkRectangle erase_rect;
     if ( isVert )
     {
     GdkRectangle erase_rect;
     if ( isVert )
     {

-    int h = win->GetClientSize().GetHeight();
+        int h = win->GetClientSize().GetHeight();

     
         rect.x = position;
     
         rect.x = position;

-        rect.y = h/2 - 14/2;
+        rect.y = 0;

         rect.width = SASH_FULL_SIZE;
         rect.width = SASH_FULL_SIZE;

-        rect.height = 14;
+        rect.height = h;

     
         erase_rect.x = position;
         erase_rect.y = 0;
     
         erase_rect.x = position;
         erase_rect.y = 0;


@@ -310,12 +310,12 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
     }
     else // horz
     {
     }
     else // horz
     {

-    int w = win->GetClientSize().GetWidth();
+        int w = win->GetClientSize().GetWidth();

     
     

-        rect.x = w/2 - 14/2;
+        rect.x = 0;

         rect.y = position;
         rect.height = SASH_FULL_SIZE;
         rect.y = position;
         rect.height = SASH_FULL_SIZE;

-        rect.width = 14;
+        rect.width = w;

     
         erase_rect.y = position;
         erase_rect.x = 0;
     
         erase_rect.y = position;
         erase_rect.x = 0;


@@ -356,7 +356,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
         rect.y,
         rect.width,
         rect.height,
         rect.y,
         rect.width,
         rect.height,

-        !isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL
+        isVert ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL

     );
 #else // GTK+ 1.x
 
     );
 #else // GTK+ 1.x