Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make wxGTK's wxScrolledWindow set m_x/xScrollLines to 0

Browse Source 
if scrollbars disappear (instead of 1) as per wxMSW.
  Expose m_x/yScrollLines in public getters.
  Correct window origin for scrolled window in RTL.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-09-13 10:01:21 +00:00
parent 20671963ef
commit 5713b34914
4 changed files with 78 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/gtk/dcclient.cpp
View File

@@ -26,6 +26,7 @@
#endif
#include "wx/fontutil.h"
#include "wx/scrolwin.h"
#include "wx/gtk/win_gtk.h"
#include "wx/gtk/private.h"
@@ -326,11 +327,40 @@ wxWindowDC::wxWindowDC( wxWindow *window )
if (m_owner && m_owner->m_wxwindow && (m_owner->GetLayoutDirection() == wxLayout_RightToLeft))
{
// reverse sense
m_signX = -1;
gint width;
gdk_window_get_geometry( GTK_PIZZA(m_owner->m_wxwindow)->bin_window,
NULL, NULL, &width, NULL, NULL );
m_deviceOriginX = width;;
// origin in the upper right corner
wxScrolledWindow *sw = wxDynamicCast( m_owner, wxScrolledWindow );
if (sw)
{
// We cannot use just the virtual size here, because
// the virtual size may be less than the visible area
// due to rounding errors of the scroll steps. If the
// horizontal scroll step is 10 pixels and the virtual
// area is 97 pixels, we should be able to see or scroll
// to 100 pixels, so the origin is at -100, not -97.
if (sw->GetScrollLines(wxHORIZONTAL) == 0)
{
int client_width = m_owner->GetClientSize().x;
m_deviceOriginX = client_width;
}
else
{
int scroll_step = 0;
sw->GetScrollPixelsPerUnit( &scroll_step, NULL );
int client_width = m_owner->GetClientSize().x;
int virtual_size = sw->GetVirtualSize().x;
int steps = (virtual_size + scroll_step - 1) / scroll_step;
int width = steps * scroll_step + (client_width % scroll_step);
m_deviceOriginX = width;
}
}
else
{
int client_width = m_owner->GetClientSize().x;
m_deviceOriginX = client_width;
}
}
}