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

Further corrections to GTK's scrolling widget.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-11-10 10:25:02 +00:00
parent b7b023c234
commit f2e9222d6e
2 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/gtk/scrolwin.cpp
View File

@@ -349,14 +349,8 @@ void wxScrolledWindow::SetScrollbars( int pixelsPerUnitX, int pixelsPerUnitY,
m_hAdjust->value = m_xScrollPosition = xPos; m_hAdjust->value = m_xScrollPosition = xPos;
m_vAdjust->value = m_yScrollPosition = yPos; m_vAdjust->value = m_yScrollPosition = yPos;
// For better backward compatibility we set persisting limits // The first line should arguably be deprecated, the second we still need.
// here not just the size. It makes SetScrollbars 'sticky' m_targetWindow->SetVirtualSize( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY );
// emulating the old non-autoscroll behaviour.
m_targetWindow->SetVirtualSizeHints( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY );
// The above should arguably be deprecated, this however we still need.
m_targetWindow->SetVirtualSize( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY ); m_targetWindow->SetVirtualSize( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY );
if (!noRefresh) if (!noRefresh)
@@ -389,13 +383,16 @@ void wxScrolledWindow::AdjustScrollbars()
// If the scrollbar hits the right side, move the window // If the scrollbar hits the right side, move the window
// right to keep it from over extending. // right to keep it from over extending.
if( m_hAdjust->value + m_hAdjust->page_size > m_hAdjust->upper ) if ((m_hAdjust->value != 0.0) && (m_hAdjust->value + m_hAdjust->page_size > m_hAdjust->upper))
{ {
m_hAdjust->value = m_hAdjust->upper - m_hAdjust->page_size;
if (m_hAdjust->value < 0.0)
m_hAdjust->value = 0.0;
if (GetChildren().GetCount() == 0) if (GetChildren().GetCount() == 0)
{ m_xScrollPosition = (int)m_hAdjust->value; // This is enough without child windows
m_hAdjust->value = m_hAdjust->upper - m_hAdjust->page_size; else
m_xScrollPosition = (int)m_hAdjust->value; gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" ); // Actually scroll window
}
} }
} }
@@ -409,13 +406,16 @@ void wxScrolledWindow::AdjustScrollbars()
m_vAdjust->upper = vh / m_yScrollPixelsPerLine; m_vAdjust->upper = vh / m_yScrollPixelsPerLine;
m_vAdjust->page_size = (h / m_yScrollPixelsPerLine); m_vAdjust->page_size = (h / m_yScrollPixelsPerLine);
if( m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper ) if ((m_vAdjust->value != 0.0) && (m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper))
{ {
m_vAdjust->value = m_vAdjust->upper - m_vAdjust->page_size;
if (m_vAdjust->value < 0.0)
m_vAdjust->value = 0.0;
if (GetChildren().GetCount() == 0) if (GetChildren().GetCount() == 0)
{
m_vAdjust->value = m_vAdjust->upper - m_vAdjust->page_size;
m_yScrollPosition = (int)m_vAdjust->value; m_yScrollPosition = (int)m_vAdjust->value;
} else
gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
} }
} }
@@ -839,7 +839,9 @@ void wxScrolledWindow::OnSize(wxSizeEvent& WXUNUSED(event))
FitInside(); FitInside();
} }
else else
{
AdjustScrollbars(); AdjustScrollbars();
}
} }
// This calls OnDraw, having adjusted the origin according to the current // This calls OnDraw, having adjusted the origin according to the current

36
src/gtk1/scrolwin.cpp
View File

@@ -349,14 +349,8 @@ void wxScrolledWindow::SetScrollbars( int pixelsPerUnitX, int pixelsPerUnitY,
m_hAdjust->value = m_xScrollPosition = xPos; m_hAdjust->value = m_xScrollPosition = xPos;
m_vAdjust->value = m_yScrollPosition = yPos; m_vAdjust->value = m_yScrollPosition = yPos;
// For better backward compatibility we set persisting limits // The first line should arguably be deprecated, the second we still need.
// here not just the size. It makes SetScrollbars 'sticky' m_targetWindow->SetVirtualSize( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY );
// emulating the old non-autoscroll behaviour.
m_targetWindow->SetVirtualSizeHints( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY );
// The above should arguably be deprecated, this however we still need.
m_targetWindow->SetVirtualSize( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY ); m_targetWindow->SetVirtualSize( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY );
if (!noRefresh) if (!noRefresh)
@@ -389,13 +383,16 @@ void wxScrolledWindow::AdjustScrollbars()
// If the scrollbar hits the right side, move the window // If the scrollbar hits the right side, move the window
// right to keep it from over extending. // right to keep it from over extending.
if( m_hAdjust->value + m_hAdjust->page_size > m_hAdjust->upper ) if ((m_hAdjust->value != 0.0) && (m_hAdjust->value + m_hAdjust->page_size > m_hAdjust->upper))
{ {
m_hAdjust->value = m_hAdjust->upper - m_hAdjust->page_size;
if (m_hAdjust->value < 0.0)
m_hAdjust->value = 0.0;
if (GetChildren().GetCount() == 0) if (GetChildren().GetCount() == 0)
{ m_xScrollPosition = (int)m_hAdjust->value; // This is enough without child windows
m_hAdjust->value = m_hAdjust->upper - m_hAdjust->page_size; else
m_xScrollPosition = (int)m_hAdjust->value; gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" ); // Actually scroll window
}
} }
} }
@@ -409,13 +406,16 @@ void wxScrolledWindow::AdjustScrollbars()
m_vAdjust->upper = vh / m_yScrollPixelsPerLine; m_vAdjust->upper = vh / m_yScrollPixelsPerLine;
m_vAdjust->page_size = (h / m_yScrollPixelsPerLine); m_vAdjust->page_size = (h / m_yScrollPixelsPerLine);
if( m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper ) if ((m_vAdjust->value != 0.0) && (m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper))
{ {
m_vAdjust->value = m_vAdjust->upper - m_vAdjust->page_size;
if (m_vAdjust->value < 0.0)
m_vAdjust->value = 0.0;
if (GetChildren().GetCount() == 0) if (GetChildren().GetCount() == 0)
{
m_vAdjust->value = m_vAdjust->upper - m_vAdjust->page_size;
m_yScrollPosition = (int)m_vAdjust->value; m_yScrollPosition = (int)m_vAdjust->value;
} else
gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
} }
} }
@@ -839,7 +839,9 @@ void wxScrolledWindow::OnSize(wxSizeEvent& WXUNUSED(event))
FitInside(); FitInside();
} }
else else
{
AdjustScrollbars(); AdjustScrollbars();
}
} }
// This calls OnDraw, having adjusted the origin according to the current // This calls OnDraw, having adjusted the origin according to the current