// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
IMPLEMENT_DYNAMIC_CLASS(wxQueryLayoutInfoEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxCalculateLayoutEvent, wxEvent)
+#if wxUSE_SASH
IMPLEMENT_CLASS(wxSashLayoutWindow, wxSashWindow)
BEGIN_EVENT_TABLE(wxSashLayoutWindow, wxSashWindow)
EVT_QUERY_LAYOUT_INFO(wxSashLayoutWindow::OnQueryLayoutInfo)
END_EVENT_TABLE()
-wxSashLayoutWindow::wxSashLayoutWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos,
- const wxSize& size, long style, const wxString& name):
- wxSashWindow(parent, id, pos, size, style, name)
+bool wxSashLayoutWindow::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos,
+ const wxSize& size, long style, const wxString& name)
+{
+ return wxSashWindow::Create(parent, id, pos, size, style, name);
+}
+
+void wxSashLayoutWindow::Init()
{
m_orientation = wxLAYOUT_HORIZONTAL;
m_alignment = wxLAYOUT_TOP;
}
case wxLAYOUT_NONE:
{
- break;
+ break;
}
}
{
// If not in query mode, resize the window.
// TODO: add wxRect& form to wxWindow::SetSize
+ wxSize sz = GetSize();
+ wxPoint pos = GetPosition();
SetSize(thisRect.x, thisRect.y, thisRect.width, thisRect.height);
+
+ // Make sure the sash is erased when the window is resized
+ if ((pos.x != thisRect.x || pos.y != thisRect.y || sz.x != thisRect.width || sz.y != thisRect.height) &&
+ (GetSashVisible(wxSASH_TOP) || GetSashVisible(wxSASH_RIGHT) || GetSashVisible(wxSASH_BOTTOM) || GetSashVisible(wxSASH_LEFT)))
+ Refresh(TRUE);
+
}
event.SetRect(clientSize);
}
+#endif // wxUSE_SASH
/*
* wxLayoutAlgorithm
return TRUE;
}
-// Layout algorithm for normal frame. mainWindow gets what's left over.
-bool wxLayoutAlgorithm::LayoutFrame(wxFrame* frame, wxWindow* mainWindow)
+// Layout algorithm for any window. mainWindow gets what's left over.
+bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow)
{
+ // Test if the parent is a sash window, and if so,
+ // reduce the available space to allow space for any active edges.
+
+ int leftMargin = 0, rightMargin = 0, topMargin = 0, bottomMargin = 0;
+#if wxUSE_SASH
+ if (parent->IsKindOf(CLASSINFO(wxSashWindow)))
+ {
+ wxSashWindow* sashWindow = (wxSashWindow*) parent;
+
+ leftMargin = sashWindow->GetExtraBorderSize();
+ rightMargin = sashWindow->GetExtraBorderSize();
+ topMargin = sashWindow->GetExtraBorderSize();
+ bottomMargin = sashWindow->GetExtraBorderSize();
+
+ if (sashWindow->GetSashVisible(wxSASH_LEFT))
+ leftMargin += sashWindow->GetDefaultBorderSize();
+ if (sashWindow->GetSashVisible(wxSASH_RIGHT))
+ rightMargin += sashWindow->GetDefaultBorderSize();
+ if (sashWindow->GetSashVisible(wxSASH_TOP))
+ topMargin += sashWindow->GetDefaultBorderSize();
+ if (sashWindow->GetSashVisible(wxSASH_BOTTOM))
+ bottomMargin += sashWindow->GetDefaultBorderSize();
+ }
+#endif // wxUSE_SASH
+
int cw, ch;
- frame->GetClientSize(& cw, & ch);
+ parent->GetClientSize(& cw, & ch);
- wxRect rect(0, 0, cw, ch);
+ wxRect rect(leftMargin, topMargin, cw - leftMargin - rightMargin, ch - topMargin - bottomMargin);
wxCalculateLayoutEvent event;
event.SetRect(rect);
- wxNode* node = frame->GetChildren().First();
+ // Find the last layout-aware window, so we can make it fill all remaining
+ // space.
+ wxWindow* lastAwareWindow = NULL;
+ wxNode* node = parent->GetChildren().First();
while (node)
{
wxWindow* win = (wxWindow*) node->Data();
- event.SetId(win->GetId());
- event.SetEventObject(win);
- event.SetFlags(0); // ??
+ if (win->IsShown())
+ {
+ wxCalculateLayoutEvent tempEvent(win->GetId());
+ tempEvent.SetEventObject(win);
+ tempEvent.SetFlags(wxLAYOUT_QUERY);
+ tempEvent.SetRect(event.GetRect());
+ if (win->GetEventHandler()->ProcessEvent(tempEvent))
+ lastAwareWindow = win;
+ }
- win->GetEventHandler()->ProcessEvent(event);
+ node = node->Next();
+ }
+
+ // Now do a dummy run to see if we have any space left for the final window (fail if not)
+ node = parent->GetChildren().First();
+ while (node)
+ {
+ wxWindow* win = (wxWindow*) node->Data();
+
+ // If mainWindow is NULL and we're at the last window,
+ // skip this, because we'll simply make it fit the remaining space.
+ if (win->IsShown() && (win != mainWindow) && (mainWindow != NULL || win != lastAwareWindow))
+ {
+ event.SetId(win->GetId());
+ event.SetEventObject(win);
+ event.SetFlags(wxLAYOUT_QUERY);
+
+ win->GetEventHandler()->ProcessEvent(event);
+ }
+
+ node = node->Next();
+ }
+
+ if (event.GetRect().GetWidth() < 0 || event.GetRect().GetHeight() < 0)
+ return FALSE;
+
+ event.SetRect(rect);
+
+ node = parent->GetChildren().First();
+ while (node)
+ {
+ wxWindow* win = (wxWindow*) node->Data();
+
+ // If mainWindow is NULL and we're at the last window,
+ // skip this, because we'll simply make it fit the remaining space.
+ if (win->IsShown() && (win != mainWindow) && (mainWindow != NULL || win != lastAwareWindow))
+ {
+ event.SetId(win->GetId());
+ event.SetEventObject(win);
+ event.SetFlags(0); // ??
+
+ win->GetEventHandler()->ProcessEvent(event);
+ }
node = node->Next();
}
rect = event.GetRect();
if (mainWindow)
- mainWindow->SetSize(rect.x, rect.y, rect.width, rect.height);
+ mainWindow->SetSize(rect.x, rect.y, wxMax(0, rect.width), wxMax(0, rect.height));
+ else if (lastAwareWindow)
+ {
+ // Fit the remaining space
+ lastAwareWindow->SetSize(rect.x, rect.y, wxMax(0, rect.width), wxMax(0, rect.height));
+ }
return TRUE;
}
projects / wxWidgets.git / blobdiff