X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e691f46b2ec1b5dbbff2e51131e3c532e688a89..2c0a4e08a3d1f54708f87b3c33142c030b2ef781:/src/gtk/scrolwin.cpp

diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp
index 1d2378e79b..a18ec663f7 100644
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -2,7 +2,7 @@
 // Name:        gtk/scrolwin.cpp
 // Purpose:     wxScrolledWindow implementation
 // Author:      Julian Smart
-// Modified by:
+// Modified by: Ron Lee
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
@@ -33,6 +33,7 @@
 
 #include "wx/scrolwin.h"
 #include "wx/panel.h"
+#include "wx/sizer.h"
 
 #include "wx/gtk/private.h"
 #include "wx/gtk/win_gtk.h"
@@ -201,8 +202,6 @@ void wxScrolledWindow::Init()
     m_yScrollingEnabled = TRUE;
     m_xScrollPosition = 0;
     m_yScrollPosition = 0;
-    m_xScrollLines = 0;
-    m_yScrollLines = 0;
     m_xScrollLinesPerPage = 0;
     m_yScrollLinesPerPage = 0;
     m_targetWindow = (wxWindow*) NULL;
@@ -275,13 +274,13 @@ bool wxScrolledWindow::Create(wxWindow *parent,
     m_vAdjust->upper = 1.0;
     m_vAdjust->value = 0.0;
     m_vAdjust->step_increment = 1.0;
-    m_vAdjust->page_increment = 1.0;
+    m_vAdjust->page_increment = 2.0;
     gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
     m_hAdjust->lower = 0.0;
     m_hAdjust->upper = 1.0;
     m_hAdjust->value = 0.0;
     m_hAdjust->step_increment = 1.0;
-    m_hAdjust->page_increment = 1.0;
+    m_hAdjust->page_increment = 2.0;
     gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
 
     // Handlers for new scrollbar values
@@ -308,13 +307,13 @@ bool wxScrolledWindow::Create(wxWindow *parent,
 
     if (m_parent)
         m_parent->DoAddChild( this );
-        
+
     m_focusWidget = m_wxwindow;
 
     PostCreation();
 
     Show( TRUE );
-
+    
     return TRUE;
 }
 
@@ -322,62 +321,106 @@ bool wxScrolledWindow::Create(wxWindow *parent,
 // setting scrolling parameters
 // ----------------------------------------------------------------------------
 
+void wxScrolledWindow::DoSetVirtualSize( int x, int y )
+{
+    wxPanel::DoSetVirtualSize( x, y );
+    AdjustScrollbars();
+
+#if wxUSE_CONSTRAINTS
+    if (GetAutoLayout())
+        Layout();
+#endif
+}
+
 /*
  * pixelsPerUnitX/pixelsPerUnitY: number of pixels per unit (e.g. pixels per text line)
  * noUnitsX/noUnitsY:        : no. units per scrollbar
  */
-void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
-               int noUnitsX, int noUnitsY,
-               int xPos, int yPos, bool noRefresh )
+void wxScrolledWindow::SetScrollbars( int pixelsPerUnitX, int pixelsPerUnitY,
+                                      int noUnitsX, int noUnitsY,
+                                      int xPos, int yPos, bool noRefresh )
 {
     int old_x = m_xScrollPixelsPerLine * m_xScrollPosition;
     int old_y = m_yScrollPixelsPerLine * m_yScrollPosition;
-    
+
     m_xScrollPixelsPerLine = pixelsPerUnitX;
     m_yScrollPixelsPerLine = pixelsPerUnitY;
-    m_xScrollLines = noUnitsX;
-    m_yScrollLines = noUnitsY;
-    m_xScrollPosition = xPos;
-    m_yScrollPosition = yPos;
 
-    m_hAdjust->lower = 0.0;
-    m_hAdjust->upper = noUnitsX;
-    m_hAdjust->value = xPos;
-    m_hAdjust->step_increment = 1.0;
-    m_hAdjust->page_increment = 2.0;
+    m_hAdjust->value = m_xScrollPosition = xPos;
+    m_vAdjust->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 );
+
+    m_targetWindow->SetVirtualSize( noUnitsX * pixelsPerUnitX, noUnitsY * pixelsPerUnitY );
 
-    m_vAdjust->lower = 0.0;
-    m_vAdjust->upper = noUnitsY;
-    m_vAdjust->value = yPos;
-    m_vAdjust->step_increment = 1.0;
-    m_vAdjust->page_increment = 2.0;
-    
-    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_targetWindow->ScrollWindow( old_x - new_x, old_y - new_y );
     }
 }
 
 void wxScrolledWindow::AdjustScrollbars()
 {
     int w, h;
+    int vw, vh;
+
     m_targetWindow->GetClientSize( &w, &h );
+    m_targetWindow->GetVirtualSize( &vw, &vh );
 
     if (m_xScrollPixelsPerLine == 0)
+    {
+        m_hAdjust->upper = 1.0;
         m_hAdjust->page_size = 1.0;
+    }
     else
+    {
+        m_hAdjust->upper = vw / m_xScrollPixelsPerLine;
         m_hAdjust->page_size = (w / m_xScrollPixelsPerLine);
 
+        // If the scrollbar hits the right side, move the window
+        // right to keep it from over extending.
+
+        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)
+                m_xScrollPosition = (int)m_hAdjust->value; // This is enough without child windows
+            else
+                gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" ); // Actually scroll window
+        }
+    }
+
     if (m_yScrollPixelsPerLine == 0)
+    {
+        m_vAdjust->upper = 1.0;
         m_vAdjust->page_size = 1.0;
+    }
     else
+    {
+        m_vAdjust->upper = vh / m_yScrollPixelsPerLine;
         m_vAdjust->page_size = (h / m_yScrollPixelsPerLine);
 
+        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)
+                m_yScrollPosition = (int)m_vAdjust->value;  
+            else
+                gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
+        }
+    }
+
     m_xScrollLinesPerPage = (int)(m_hAdjust->page_size + 0.5);
     m_yScrollLinesPerPage = (int)(m_vAdjust->page_size + 0.5);
 
@@ -385,6 +428,7 @@ void wxScrolledWindow::AdjustScrollbars()
     gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
 }
 
+
 // ----------------------------------------------------------------------------
 // target window handling
 // ----------------------------------------------------------------------------
@@ -408,6 +452,22 @@ void wxScrolledWindow::PrepareDC(wxDC& dc)
                         -m_yScrollPosition * m_yScrollPixelsPerLine );
 }
 
+void wxScrolledWindow::SetScrollRate( int xstep, int ystep )
+{
+    int old_x = m_xScrollPixelsPerLine * m_xScrollPosition;
+    int old_y = m_yScrollPixelsPerLine * m_yScrollPosition;
+
+    m_xScrollPixelsPerLine = xstep;
+    m_yScrollPixelsPerLine = ystep;
+
+    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 );
+
+    AdjustScrollbars();
+}
+
 void wxScrolledWindow::GetScrollPixelsPerUnit (int *x_unit, int *y_unit) const
 {
     if ( x_unit )
@@ -477,8 +537,7 @@ void wxScrolledWindow::OnScroll(wxScrollWinEvent& event)
 
 void wxScrolledWindow::Scroll( int x_pos, int y_pos )
 {
-    if (!m_targetWindow)
-        return;
+    wxASSERT_MSG( m_targetWindow != 0, _T("No target window") );
 
     if (((x_pos == -1) || (x_pos == m_xScrollPosition)) &&
         ((y_pos == -1) || (y_pos == m_yScrollPosition))) return;
@@ -526,8 +585,7 @@ void wxScrolledWindow::Scroll( int x_pos, int y_pos )
 
 void wxScrolledWindow::GtkVScroll( float value, unsigned int scroll_type )
 {
-    if (!m_targetWindow)
-        return;
+    wxASSERT_MSG( m_targetWindow != 0, _T("No target window") );
 
     if (m_yScrollPixelsPerLine == 0)
         return;
@@ -546,8 +604,7 @@ void wxScrolledWindow::GtkVScroll( float value, unsigned int scroll_type )
 
 void wxScrolledWindow::GtkHScroll( float value, unsigned int scroll_type )
 {
-    if (!m_targetWindow)
-        return;
+    wxASSERT_MSG( m_targetWindow != 0, _T("No target window") );
 
     if (m_xScrollPixelsPerLine == 0)
         return;
@@ -570,14 +627,6 @@ void wxScrolledWindow::EnableScrolling (bool x_scroll, bool y_scroll)
     m_yScrollingEnabled = y_scroll;
 }
 
-void wxScrolledWindow::GetVirtualSize (int *x, int *y) const
-{
-    if ( x )
-        *x = m_xScrollPixelsPerLine * m_xScrollLines;
-    if ( y )
-        *y = m_yScrollPixelsPerLine * m_yScrollLines;
-}
-
 // Where the current view starts from
 void wxScrolledWindow::GetViewStart (int *x, int *y) const
 {
@@ -587,7 +636,7 @@ void wxScrolledWindow::GetViewStart (int *x, int *y) const
         *y = m_yScrollPosition;
 }
 
-void wxScrolledWindow::CalcScrolledPosition(int x, int y, int *xx, int *yy) const
+void wxScrolledWindow::DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const
 {
     if ( xx )
         *xx = x - m_xScrollPosition * m_xScrollPixelsPerLine;
@@ -595,7 +644,7 @@ void wxScrolledWindow::CalcScrolledPosition(int x, int y, int *xx, int *yy) cons
         *yy = y - m_yScrollPosition * m_yScrollPixelsPerLine;
 }
 
-void wxScrolledWindow::CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const
+void wxScrolledWindow::DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const
 {
     if ( xx )
         *xx = x + m_xScrollPosition * m_xScrollPixelsPerLine;
@@ -619,9 +668,9 @@ int wxScrolledWindow::CalcScrollInc(wxScrollWinEvent& event)
     if (event.GetEventType() == wxEVT_SCROLLWIN_BOTTOM)
     {
             if (orient == wxHORIZONTAL)
-                nScrollInc = m_xScrollLines - m_xScrollPosition;
+                nScrollInc = GetVirtualSize().GetWidth() / m_xScrollPixelsPerLine - m_xScrollPosition;
             else
-                nScrollInc = m_yScrollLines - m_yScrollPosition;
+                nScrollInc = GetVirtualSize().GetHeight() / m_yScrollPixelsPerLine - m_yScrollPosition;
     } else
     if (event.GetEventType() == wxEVT_SCROLLWIN_LINEUP)
     {
@@ -760,6 +809,23 @@ void wxScrolledWindow::GtkVDisconnectEvent()
         (GtkSignalFunc) gtk_scrolled_window_vscroll_callback, (gpointer) this );
 }
 
+bool wxScrolledWindow::Layout()
+{
+    if (GetSizer() && m_targetWindow == this)
+    {
+        // If we're the scroll target, take into account the
+        // virtual size and scrolled position of the window.
+
+        int x, y, w, h;
+        CalcScrolledPosition(0,0, &x,&y);
+        GetVirtualSize(&w, &h);
+        GetSizer()->SetDimension(x, y, w, h);
+        return TRUE;
+    }
+    else
+        return wxPanel::Layout();  // fall back to default for LayoutConstraints
+}
+
 // ----------------------------------------------------------------------------
 // event handlers
 // ----------------------------------------------------------------------------
@@ -767,12 +833,17 @@ void wxScrolledWindow::GtkVDisconnectEvent()
 // Default OnSize resets scrollbars, if any
 void wxScrolledWindow::OnSize(wxSizeEvent& WXUNUSED(event))
 {
-#if wxUSE_CONSTRAINTS
-    if (GetAutoLayout())
-        Layout();
-#endif
+    if( GetAutoLayout() )
+    {
+        if( m_targetWindow != this )
+            m_targetWindow->FitInside();
 
-    AdjustScrollbars();
+        FitInside();
+    }
+    else
+    {
+        AdjustScrollbars();
+    }
 }
 
 // This calls OnDraw, having adjusted the origin according to the current
@@ -795,7 +866,7 @@ void wxScrolledWindow::OnChar(wxKeyEvent& event)
         szx, szy,       // view size (total)
         clix, cliy;     // view size (on screen)
 
-    ViewStart(&stx, &sty);
+    GetViewStart(&stx, &sty);
     GetClientSize(&clix, &cliy);
     GetVirtualSize(&szx, &szy);
 
@@ -886,3 +957,5 @@ void wxScrolledWindow::OnChar(wxKeyEvent& event)
     }
 }
 
+
+// vi:sts=4:sw=4:et