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

more fixes to wxSplitterWindow's initial sash position

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-02-16 01:51:06 +00:00
parent fd94e8aa45
commit ca39e4095a
2 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/generic/splitter.h
View File

@@ -151,7 +151,7 @@ public:
int GetSashPosition() const { return m_sashPosition; }
// If this is zero, we can remove panes by dragging the sash.
void SetMinimumPaneSize(int min) { m_minimumPaneSize = min; }
void SetMinimumPaneSize(int min);
int GetMinimumPaneSize() const { return m_minimumPaneSize; }
// Called when the sash position is about to be changed, return
@@ -231,6 +231,9 @@ protected:
// get either width or height depending on the split mode
int GetWindowSize() const;
// set m_sashPosition w/ safeguards
void DoSetSashPosition(int sashPos);
wxSplitMode m_splitMode;
bool m_permitUnsplitAlways;
@@ -243,6 +246,7 @@ protected:
int m_borderSize;
int m_sashSize; // Sash width or height
int m_sashPosition; // Number of pixels from left or top
int m_requestedSashPosition;
int m_firstX;
int m_firstY;
int m_minimumPaneSize;

65
src/generic/splitter.cpp
View File

@@ -114,7 +114,7 @@ void wxSplitterWindow::Init()
m_firstY = 0;
m_sashSize = 7;
m_borderSize = 2;
m_sashPosition = 0;
m_sashPosition = m_requestedSashPosition = 0;
m_minimumPaneSize = 0;
m_sashCursorWE = new wxCursor(wxCURSOR_SIZEWE);
m_sashCursorNS = new wxCursor(wxCURSOR_SIZENS);
@@ -247,7 +247,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
m_windowOne = m_windowTwo;
m_windowTwo = (wxWindow *) NULL;
SendUnsplitEvent(removedWindow);
m_sashPosition = 0;
DoSetSashPosition(0);
}
else if ( new_sash_position == window_size )
{
@@ -255,16 +255,16 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
wxWindow *removedWindow = m_windowTwo;
m_windowTwo = (wxWindow *) NULL;
SendUnsplitEvent(removedWindow);
m_sashPosition = 0;
DoSetSashPosition(0);
}
else
{
m_sashPosition = new_sash_position;
DoSetSashPosition(new_sash_position);
}
}
else
{
m_sashPosition = new_sash_position;
DoSetSashPosition(new_sash_position);
}
SizeWindows();
@@ -366,7 +366,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
}
else
{
m_sashPosition = new_sash_position;
DoSetSashPosition(new_sash_position);
m_needUpdating = TRUE;
}
}
@@ -427,12 +427,12 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event)
if ( m_splitMode == wxSPLIT_VERTICAL )
{
if ( m_sashPosition >= (cw - 5) )
m_sashPosition = wxMax(10, cw - 40);
DoSetSashPosition(wxMax(10, cw - 40));
}
else // m_splitMode == wxSPLIT_HORIZONTAL
{
if ( m_sashPosition >= (ch - 5) )
m_sashPosition = wxMax(10, ch - 40);
DoSetSashPosition(wxMax(10, ch - 40));
}
}
@@ -704,16 +704,6 @@ int wxSplitterWindow::AdjustSashPosition(int sashPos) const
{
int window_size = GetWindowSize();
// VZ: dirty fix, 20 is the initial window size under wxGTK, this is
// going to be replaced with the correct Vaclav's code soon (FIXME)
if ( window_size <= 20 )
{
// don't do anything before the window has a valid size, otherwise we
// put the sash to 0 at the very beginning and it doesn't move from
// there any more
return sashPos;
}
wxWindow *win;
win = GetWindow1();
@@ -750,18 +740,27 @@ int wxSplitterWindow::AdjustSashPosition(int sashPos) const
return sashPos;
}
void wxSplitterWindow::DoSetSashPosition(int sashPos)
{
m_requestedSashPosition = sashPos;
m_sashPosition = (sashPos == 0) ? 0 : AdjustSashPosition(sashPos);
}
// Position and size subwindows.
// Note that the border size applies to each subwindow, not
// including the edges next to the sash.
void wxSplitterWindow::SizeWindows()
{
if ( m_requestedSashPosition != m_sashPosition )
DoSetSashPosition(m_requestedSashPosition);
int w, h;
GetClientSize(&w, &h);
if ( GetWindow1() && !GetWindow2() )
{
GetWindow1()->SetSize(GetBorderSize(), GetBorderSize(), w - 2*GetBorderSize(), h - 2*GetBorderSize());
GetWindow1()->SetSize(GetBorderSize(), GetBorderSize(),
w - 2*GetBorderSize(), h - 2*GetBorderSize());
}
else if ( GetWindow1() && GetWindow2() )
{
@@ -801,7 +800,7 @@ void wxSplitterWindow::Initialize(wxWindow *window)
{
m_windowOne = window;
m_windowTwo = (wxWindow *) NULL;
m_sashPosition = 0;
DoSetSashPosition(0);
}
// Associates the given window with window 2, drawing the appropriate sash
@@ -822,25 +821,17 @@ bool wxSplitterWindow::DoSplit(wxSplitMode mode,
if ( sashPosition > 0 )
{
m_sashPosition = sashPosition;
DoSetSashPosition(sashPosition);
}
else if ( sashPosition < 0 )
{
// It's negative so adding is subtracting
m_sashPosition = window_size + sashPosition;
DoSetSashPosition(window_size + sashPosition);
}
else
{
// default
m_sashPosition = window_size/2;
}
// don't do it initially, i.e. when creating the window because it doesn't
// have a proper size yet and AdjustSashPosition() would happily set the
// sash position to 0!
if ( window_size > 0 )
{
m_sashPosition = AdjustSashPosition(m_sashPosition);
DoSetSashPosition(window_size/2);
}
SizeWindows();
@@ -875,7 +866,7 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
}
SendUnsplitEvent(win);
m_sashPosition = 0;
DoSetSashPosition(0);
SizeWindows();
return TRUE;
@@ -907,9 +898,15 @@ bool wxSplitterWindow::ReplaceWindow(wxWindow *winOld, wxWindow *winNew)
return TRUE;
}
void wxSplitterWindow::SetMinimumPaneSize(int min)
{
m_minimumPaneSize = min;
SetSashPosition(m_sashPosition); // re-check limits
}
void wxSplitterWindow::SetSashPosition(int position, bool redraw)
{
m_sashPosition = AdjustSashPosition(position);
DoSetSashPosition(position);
if ( redraw )
{