X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9948d31f4e327d555cc92a6570047b8ca4db467d..c0fbf24ba6abc81db66ead334d69af670a8ec5a7:/src/generic/splitter.cpp diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp index dc50eb3590..3b9a91b518 100644 --- a/src/generic/splitter.cpp +++ b/src/generic/splitter.cpp @@ -33,6 +33,7 @@ #include "wx/dcscreen.h" #include "wx/settings.h" #include "wx/log.h" +#include "wx/utils.h" DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED) DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING) @@ -87,6 +88,13 @@ bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id, m_borderSize = 1; else m_borderSize = 0; + +#ifdef __WXMAC__ + int major,minor; + wxGetOsVersion( &major, &minor ); + if (major >= 10) + m_windowStyle |= wxSP_SASH_AQUA; +#endif return TRUE; } @@ -508,7 +516,11 @@ void wxSplitterWindow::DrawSash(wxDC& dc) if ( m_splitMode == wxSPLIT_VERTICAL ) { dc.SetPen(*m_facePen); - dc.SetBrush(*m_faceBrush); + + if (HasFlag( wxSP_SASH_AQUA )) + dc.SetBrush(*wxWHITE_BRUSH); + else + dc.SetBrush(*m_faceBrush); dc.DrawRectangle(m_sashPosition + 2, 0 , m_sashSize - 4, h ); dc.SetBrush(*wxTRANSPARENT_BRUSH); @@ -520,13 +532,18 @@ void wxSplitterWindow::DrawSash(wxDC& dc) dc.SetPen(*m_hilightPen); dc.DrawLine(m_sashPosition+1, m_borderSize - 2, m_sashPosition+1, h - m_borderSize+2); - dc.SetPen(*m_mediumShadowPen); - int yMedium = m_borderSize ? h-m_borderSize+1 : h ; + if (!HasFlag( wxSP_SASH_AQUA )) + dc.SetPen(*m_mediumShadowPen); + + int yMedium = m_borderSize ? h-m_borderSize+1 : h ; dc.DrawLine(m_sashPosition+m_sashSize-2, xShadow, m_sashPosition+m_sashSize-2, yMedium); - dc.SetPen(*m_darkShadowPen); + if (HasFlag( wxSP_SASH_AQUA )) + dc.SetPen(*m_lightShadowPen); + else + dc.SetPen(*m_darkShadowPen); dc.DrawLine(m_sashPosition+m_sashSize-1, m_borderSize, m_sashPosition+m_sashSize-1, h-m_borderSize ); - + // Draw the top and bottom edges of the sash, if requested if (GetWindowStyle() & wxSP_FULLSASH) { @@ -542,7 +559,10 @@ void wxSplitterWindow::DrawSash(wxDC& dc) else { dc.SetPen(*m_facePen); - dc.SetBrush(*m_faceBrush); + if (HasFlag( wxSP_SASH_AQUA )) + dc.SetBrush(*wxWHITE_BRUSH); + else + dc.SetBrush(*m_faceBrush); dc.DrawRectangle( m_borderSize-2, m_sashPosition + 2, w-m_borderSize+2, m_sashSize - 4); dc.SetBrush(*wxTRANSPARENT_BRUSH); @@ -553,10 +573,14 @@ void wxSplitterWindow::DrawSash(wxDC& dc) dc.SetPen(*m_hilightPen); dc.DrawLine(m_borderSize-2, m_sashPosition+1, w-m_borderSize+1, m_sashPosition+1); - dc.SetPen(*m_mediumShadowPen); + if (!HasFlag( wxSP_SASH_AQUA )) + dc.SetPen(*m_mediumShadowPen); dc.DrawLine(m_borderSize-1, m_sashPosition+m_sashSize-2, w-m_borderSize+1, m_sashPosition+m_sashSize-2); - dc.SetPen(*m_darkShadowPen); + if (HasFlag( wxSP_SASH_AQUA )) + dc.SetPen(*m_lightShadowPen); + else + dc.SetPen(*m_darkShadowPen); dc.DrawLine(m_borderSize, m_sashPosition+m_sashSize-1, w-m_borderSize, m_sashPosition+m_sashSize-1); // Draw the left and right edges of the sash, if requested @@ -665,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. @@ -739,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(); @@ -763,6 +820,8 @@ bool wxSplitterWindow::SplitHorizontally(wxWindow *window1, wxWindow *window2, i else // default m_sashPosition = h/2; + AdjustSashPosition(m_sashPosition); + SizeWindows(); return TRUE; @@ -831,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 ) { @@ -850,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); @@ -921,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,