// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#endif
#include "wx/scrolwin.h"
-#include "wx/gtk/private.h"
-// ============================================================================
-// implementation
-// ============================================================================
+#include <gtk/gtk.h>
// ----------------------------------------------------------------------------
// wxScrollHelper implementation
// ----------------------------------------------------------------------------
-void wxScrollHelperNative::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
- int noUnitsX, int noUnitsY,
- int xPos, int yPos,
- bool noRefresh)
+void wxScrollHelper::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
+ int noUnitsX, int noUnitsY,
+ int xPos, int yPos,
+ bool noRefresh)
{
- int xs, ys;
- GetViewStart(& xs, & ys);
-
- int old_x = m_xScrollPixelsPerLine * xs;
- int old_y = m_yScrollPixelsPerLine * ys;
-
- m_xScrollPixelsPerLine = pixelsPerUnitX;
- m_yScrollPixelsPerLine = pixelsPerUnitY;
-
- m_win->m_scrollBar[wxWindow::ScrollDir_Horz]->adjustment->value =
- m_xScrollPosition = xPos;
- m_win->m_scrollBar[wxWindow::ScrollDir_Vert]->adjustment->value =
- m_yScrollPosition = yPos;
-
- // Setting hints here should arguably be deprecated, but without it
- // a sizer might override this manual scrollbar setting in old code.
- // m_targetWindow->SetVirtualSizeHints( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY );
-
- int w = noUnitsX * pixelsPerUnitX;
- int h = noUnitsY * pixelsPerUnitY;
- m_targetWindow->SetVirtualSize( w ? w : wxDefaultCoord,
- h ? h : wxDefaultCoord);
-
- // If the target is not the same as the window with the scrollbars,
- // then we need to update the scrollbars here, since they won't have
- // been updated by SetVirtualSize().
- if (m_targetWindow != m_win)
- {
- AdjustScrollbars();
- }
-
- if (!noRefresh)
- {
- int new_x = m_xScrollPixelsPerLine * m_xScrollPosition;
- int new_y = m_yScrollPixelsPerLine * m_yScrollPosition;
-
- m_targetWindow->ScrollWindow( old_x - new_x, old_y - new_y );
- }
+ m_win->m_scrollPos[wxWindow::ScrollDir_Horz] =
+ m_win->m_scrollBar[wxWindow::ScrollDir_Horz]->adjustment->value = xPos;
+ m_win->m_scrollPos[wxWindow::ScrollDir_Vert] =
+ m_win->m_scrollBar[wxWindow::ScrollDir_Vert]->adjustment->value = yPos;
+ base_type::SetScrollbars(
+ pixelsPerUnitX, pixelsPerUnitY, noUnitsX, noUnitsY, xPos, yPos, noRefresh);
}
-void wxScrollHelperNative::DoAdjustScrollbar(GtkRange* range,
- int pixelsPerLine,
- int winSize,
- int virtSize,
- int *lines,
- int *linesPerPage)
+void wxScrollHelper::DoAdjustScrollbar(GtkRange* range,
+ int pixelsPerLine,
+ int winSize,
+ int virtSize,
+ int *pos,
+ int *lines,
+ int *linesPerPage)
{
+ if (!range)
+ return;
+
int upper;
int page_size;
if (pixelsPerLine > 0 && winSize > 0 && winSize < virtSize)
*lines = 0;
*linesPerPage = 0;
}
+
GtkAdjustment* adj = range->adjustment;
adj->step_increment = 1;
adj->page_increment =
adj->page_size = page_size;
gtk_range_set_range(range, 0, upper);
+
+ // ensure that the scroll position is always in valid range
+ if (*pos > *lines)
+ *pos = *lines;
}
-void wxScrollHelperNative::AdjustScrollbars()
+void wxScrollHelper::AdjustScrollbars()
{
- int w, h;
int vw, vh;
+ m_targetWindow->GetVirtualSize(&vw, &vh);
- // this flag indicates which window has the scrollbars
- m_win->m_hasScrolling = m_xScrollPixelsPerLine != 0 || m_yScrollPixelsPerLine != 0;
+ int w, h;
+ const wxSize availSize = GetSizeAvailableForScrollTarget(
+ m_win->GetSize() - m_win->GetWindowBorderSize());
+ if ( availSize.x >= vw && availSize.y >= vh )
+ {
+ w = availSize.x;
+ h = availSize.y;
- m_targetWindow->GetVirtualSize( &vw, &vh );
+ // we know that the scrollbars will be removed
+ DoAdjustHScrollbar(w, vw);
+ DoAdjustVScrollbar(h, vh);
+
+ return;
+ }
m_targetWindow->GetClientSize(&w, NULL);
- DoAdjustScrollbar(
- m_win->m_scrollBar[wxWindow::ScrollDir_Horz], m_xScrollPixelsPerLine,
- w, vw, &m_xScrollLines, &m_xScrollLinesPerPage);
+ DoAdjustHScrollbar(w, vw);
+
m_targetWindow->GetClientSize(NULL, &h);
- DoAdjustScrollbar(
- m_win->m_scrollBar[wxWindow::ScrollDir_Vert], m_yScrollPixelsPerLine,
- h, vh, &m_yScrollLines, &m_yScrollLinesPerPage);
+ DoAdjustVScrollbar(h, vh);
const int w_old = w;
m_targetWindow->GetClientSize(&w, NULL);
- if (w != w_old)
+ if ( w != w_old )
{
// It is necessary to repeat the calculations in this case to avoid an
// observed infinite series of size events, involving alternating
// AdjustScrollbars() to be called again. If the scrollbar visibility
// is not correct before then, yet another resize will occur, possibly
// leading to an unending series if the sizes are just right.
- DoAdjustScrollbar(
- m_win->m_scrollBar[wxWindow::ScrollDir_Horz], m_xScrollPixelsPerLine,
- w, vw, &m_xScrollLines, &m_xScrollLinesPerPage);
+ DoAdjustHScrollbar(w, vw);
+
m_targetWindow->GetClientSize(NULL, &h);
- DoAdjustScrollbar(
- m_win->m_scrollBar[wxWindow::ScrollDir_Vert], m_yScrollPixelsPerLine,
- h, vh, &m_yScrollLines, &m_yScrollLinesPerPage);
+ DoAdjustVScrollbar(h, vh);
}
}
-void wxScrollHelperNative::DoScroll(int orient,
+void wxScrollHelper::DoScrollOneDir(int orient,
int pos,
int pixelsPerLine,
int *posOld)
}
}
-void wxScrollHelperNative::Scroll( int x_pos, int y_pos )
+void wxScrollHelper::DoScroll( int x_pos, int y_pos )
+{
+ wxCHECK_RET( m_targetWindow != 0, wxT("No target window") );
+
+ DoScrollOneDir(wxHORIZONTAL, x_pos, m_xScrollPixelsPerLine, &m_xScrollPosition);
+ DoScrollOneDir(wxVERTICAL, y_pos, m_yScrollPixelsPerLine, &m_yScrollPosition);
+}
+
+// ----------------------------------------------------------------------------
+// scrollbars visibility
+// ----------------------------------------------------------------------------
+
+namespace
+{
+
+GtkPolicyType GtkPolicyFromWX(wxScrollbarVisibility visibility)
+{
+ GtkPolicyType policy;
+ switch ( visibility )
+ {
+ case wxSHOW_SB_NEVER:
+ policy = GTK_POLICY_NEVER;
+ break;
+
+ case wxSHOW_SB_DEFAULT:
+ policy = GTK_POLICY_AUTOMATIC;
+ break;
+
+ default:
+ wxFAIL_MSG( wxS("unknown scrollbar visibility") );
+ // fall through
+
+ case wxSHOW_SB_ALWAYS:
+ policy = GTK_POLICY_ALWAYS;
+ break;
+ }
+
+ return policy;
+}
+
+} // anonymous namespace
+
+void wxScrollHelper::DoShowScrollbars(wxScrollbarVisibility horz,
+ wxScrollbarVisibility vert)
{
- wxCHECK_RET( m_targetWindow != 0, _T("No target window") );
+ GtkScrolledWindow * const scrolled = GTK_SCROLLED_WINDOW(m_win->m_widget);
+ wxCHECK_RET( scrolled, "window must be created" );
- DoScroll(wxHORIZONTAL, x_pos, m_xScrollPixelsPerLine, &m_xScrollPosition);
- DoScroll(wxVERTICAL, y_pos, m_yScrollPixelsPerLine, &m_yScrollPosition);
+ gtk_scrolled_window_set_policy(scrolled,
+ GtkPolicyFromWX(horz),
+ GtkPolicyFromWX(vert));
}
projects / wxWidgets.git / blobdiff