// 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[0]->adjustment->value =
+ m_win->m_scrollBar[wxWindow::ScrollDir_Horz]->adjustment->value =
m_xScrollPosition = xPos;
- m_win->m_scrollBar[1]->adjustment->value =
+ m_win->m_scrollBar[wxWindow::ScrollDir_Vert]->adjustment->value =
m_yScrollPosition = yPos;
// Setting hints here should arguably be deprecated, but without it
m_targetWindow->SetVirtualSize( w ? w : wxDefaultCoord,
h ? h : wxDefaultCoord);
+ // Query view start after m_targetWindow->SetVirtualSize(...) since
+ // that call can change the current=old scrolling position!
+ int xs, ys;
+ GetViewStart(& xs, & ys);
+ int old_x = m_xScrollPixelsPerLine * xs;
+ int old_y = m_yScrollPixelsPerLine * ys;
+
// 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().
}
}
-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)
{
- // GtkRange won't allow upper == lower, so for disabled state use [0,1]
- // with a page size of 1. This will also clamp position to 0.
- int upper = 1;
- int page_size = 1;
+ int upper;
+ int page_size;
if (pixelsPerLine > 0 && winSize > 0 && winSize < virtSize)
{
upper = (virtSize + pixelsPerLine - 1) / pixelsPerLine;
page_size = winSize / pixelsPerLine;
+ *lines = upper;
+ *linesPerPage = page_size;
+ }
+ else
+ {
+ // GtkRange won't allow upper == lower, so for disabled state use [0,1]
+ // with a page size of 1. This will also clamp position to 0.
+ upper = 1;
+ page_size = 1;
+ *lines = 0;
+ *linesPerPage = 0;
}
-
- *lines = upper;
- *linesPerPage = page_size;
GtkAdjustment* adj = range->adjustment;
adj->step_increment = 1;
- adj->page_increment =
+ 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);
+
+ 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;
+
+ // we know that the scrollbars will be removed
+ DoAdjustHScrollbar(w, vw);
+ DoAdjustVScrollbar(h, vh);
+
+ return;
+ }
- m_targetWindow->m_hasScrolling = m_xScrollPixelsPerLine != 0 || m_yScrollPixelsPerLine != 0;
+ m_targetWindow->GetClientSize(&w, NULL);
+ DoAdjustHScrollbar(w, vw);
- m_targetWindow->GetClientSize( &w, &h );
- m_targetWindow->GetVirtualSize( &vw, &vh );
+ m_targetWindow->GetClientSize(NULL, &h);
+ DoAdjustVScrollbar(h, vh);
- DoAdjustScrollbar(m_win->m_scrollBar[0], m_xScrollPixelsPerLine, w, vw,
- &m_xScrollLines, &m_xScrollLinesPerPage);
- DoAdjustScrollbar(m_win->m_scrollBar[1], m_yScrollPixelsPerLine, h, vh,
- &m_yScrollLines, &m_yScrollLinesPerPage);
+ const int w_old = w;
+ m_targetWindow->GetClientSize(&w, NULL);
+ 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
+ // changes in visibility of the scrollbars.
+ // At this point, GTK+ has already queued a resize, which will cause
+ // 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.
+ DoAdjustHScrollbar(w, vw);
+
+ m_targetWindow->GetClientSize(NULL, &h);
+ 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, _T("No target window") );
- DoScroll(wxHORIZONTAL, x_pos, m_xScrollPixelsPerLine, &m_xScrollPosition);
- DoScroll(wxVERTICAL, y_pos, m_yScrollPixelsPerLine, &m_yScrollPosition);
+ 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;
+
+ case wxSHOW_SB_ALWAYS:
+ policy = GTK_POLICY_ALWAYS;
+ break;
+ }
+
+ return policy;
+}
+
+} // anonymous namespace
+
+void wxScrollHelper::DoShowScrollbars(wxScrollbarVisibility horz,
+ wxScrollbarVisibility vert)
+{
+ GtkScrolledWindow * const scrolled = GTK_SCROLLED_WINDOW(m_win->m_widget);
+ wxCHECK_RET( scrolled, "window must be created" );
+
+ gtk_scrolled_window_set_policy(scrolled,
+ GtkPolicyFromWX(horz),
+ GtkPolicyFromWX(vert));
+}
+
projects / wxWidgets.git / blobdiff