X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed2e7e59a9118ec16251130edefdbd2df5a3baf0..90f501b16e1b6dcc9e2aae6a413287a22842da61:/src/generic/splitter.cpp?ds=sidebyside diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp index 5d89066765..3b9a91b518 100644 --- a/src/generic/splitter.cpp +++ b/src/generic/splitter.cpp @@ -689,6 +689,37 @@ void wxSplitterWindow::DrawSashTracker(int x, int y) screenDC.SetBrush(wxNullBrush); } +void wxSplitterWindow::AdjustSashPosition(int &sashPos) +{ + int w, h; + GetClientSize(&w, &h); + int window_size = (m_splitMode == wxSPLIT_VERTICAL) ? w : h; + wxWindow *win; + + if ( sashPos < m_minimumPaneSize ) + sashPos = m_minimumPaneSize; + else if ( sashPos > window_size - m_minimumPaneSize ) + sashPos = window_size - m_minimumPaneSize; + + win = GetWindow1(); + if ( win ) + { + int minSize = (m_splitMode == wxSPLIT_VERTICAL) ? + win->GetMinWidth() : win->GetMinHeight(); + if ( minSize != -1 && sashPos < minSize + GetBorderSize() ) + sashPos = minSize + GetBorderSize(); + } + + win = GetWindow2(); + if ( win ) + { + int minSize = (m_splitMode == wxSPLIT_VERTICAL) ? + win->GetMinWidth() : win->GetMinHeight(); + if ( minSize != -1 && sashPos > window_size - minSize - GetBorderSize() ) + sashPos = window_size - minSize - GetBorderSize(); + } +} + // Position and size subwindows. // Note that the border size applies to each subwindow, not // including the edges next to the sash. @@ -763,6 +794,8 @@ bool wxSplitterWindow::SplitVertically(wxWindow *window1, wxWindow *window2, int m_sashPosition = w + sashPosition; // It's negative so adding is subtracting else // default m_sashPosition = w/2; + + AdjustSashPosition(m_sashPosition); SizeWindows(); @@ -787,6 +820,8 @@ bool wxSplitterWindow::SplitHorizontally(wxWindow *window1, wxWindow *window2, i else // default m_sashPosition = h/2; + AdjustSashPosition(m_sashPosition); + SizeWindows(); return TRUE; @@ -855,6 +890,7 @@ bool wxSplitterWindow::ReplaceWindow(wxWindow *winOld, wxWindow *winNew) void wxSplitterWindow::SetSashPosition(int position, bool redraw) { m_sashPosition = position; + AdjustSashPosition(m_sashPosition); if ( redraw ) { @@ -874,20 +910,20 @@ void wxSplitterWindow::InitColours() // Shadow colours #ifndef __WIN16__ - wxColour faceColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); + wxColour faceColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); m_facePen = new wxPen(faceColour, 1, wxSOLID); m_faceBrush = new wxBrush(faceColour, wxSOLID); - wxColour mediumShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW)); + wxColour mediumShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)); m_mediumShadowPen = new wxPen(mediumShadowColour, 1, wxSOLID); - wxColour darkShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DDKSHADOW)); + wxColour darkShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW)); m_darkShadowPen = new wxPen(darkShadowColour, 1, wxSOLID); - wxColour lightShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT)); + wxColour lightShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT)); m_lightShadowPen = new wxPen(lightShadowColour, 1, wxSOLID); - wxColour hilightColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT)); + wxColour hilightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT)); m_hilightPen = new wxPen(hilightColour, 1, wxSOLID); #else m_facePen = new wxPen("LIGHT GREY", 1, wxSOLID); @@ -945,10 +981,7 @@ void wxSplitterWindow::OnSashPosChanged(wxSplitterEvent& event) if ( !unsplit_scenario ) { // If resultant pane would be too small, enlarge it - if ( newSashPosition < m_minimumPaneSize ) - newSashPosition = m_minimumPaneSize; - if ( newSashPosition > window_size - m_minimumPaneSize ) - newSashPosition = window_size - m_minimumPaneSize; + AdjustSashPosition(newSashPosition); } // If the result is out of bounds it means minimum size is too big,