mirror of
https://github.com/wxWidgets/wxWidgets.git
synced 2026-09-28 15:50:17 +08:00
Added wxAUI_MGR_LIVE_RESIZE flag for live sash sizing, the default on wxOSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -47,6 +47,7 @@ enum wxAuiManagerOption
|
||||
wxAUI_MGR_RECTANGLE_HINT = 1 << 5,
|
||||
wxAUI_MGR_HINT_FADE = 1 << 6,
|
||||
wxAUI_MGR_NO_VENETIAN_BLINDS_FADE = 1 << 7,
|
||||
wxAUI_MGR_LIVE_RESIZE = 1 << 8,
|
||||
|
||||
wxAUI_MGR_DEFAULT = wxAUI_MGR_ALLOW_FLOATING |
|
||||
wxAUI_MGR_TRANSPARENT_HINT |
|
||||
@@ -560,6 +561,8 @@ protected:
|
||||
wxArrayInt& positions,
|
||||
wxArrayInt& sizes);
|
||||
|
||||
/// Ends a resize action, or for live update, resizes the sash
|
||||
bool DoEndResizeAction(wxMouseEvent& event);
|
||||
|
||||
public:
|
||||
|
||||
@@ -615,6 +618,7 @@ protected:
|
||||
wxAuiDockUIPart* m_hover_button;// button uipart being hovered over
|
||||
wxRect m_last_hint; // last hint rectangle
|
||||
wxPoint m_last_mouse_move; // last mouse move position (see OnMotion)
|
||||
int m_currentDragItem;
|
||||
bool m_skipping;
|
||||
bool m_has_maximized;
|
||||
|
||||
|
||||
@@ -35,6 +35,7 @@ enum wxAuiManagerOption
|
||||
wxAUI_MGR_RECTANGLE_HINT = 1 << 5,
|
||||
wxAUI_MGR_HINT_FADE = 1 << 6,
|
||||
wxAUI_MGR_NO_VENETIAN_BLINDS_FADE = 1 << 7,
|
||||
wxAUI_MGR_LIVE_RESIZE = 1 << 8,
|
||||
|
||||
wxAUI_MGR_DEFAULT = wxAUI_MGR_ALLOW_FLOATING |
|
||||
wxAUI_MGR_TRANSPARENT_HINT |
|
||||
|
||||
@@ -84,6 +84,7 @@ class MyFrame : public wxFrame
|
||||
ID_NoGradient,
|
||||
ID_VerticalGradient,
|
||||
ID_HorizontalGradient,
|
||||
ID_LiveUpdate,
|
||||
ID_Settings,
|
||||
ID_CustomizeToolbar,
|
||||
ID_DropDownToolbarItem,
|
||||
@@ -591,6 +592,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
|
||||
EVT_MENU(ID_HintFade, MyFrame::OnManagerFlag)
|
||||
EVT_MENU(ID_NoVenetianFade, MyFrame::OnManagerFlag)
|
||||
EVT_MENU(ID_TransparentDrag, MyFrame::OnManagerFlag)
|
||||
EVT_MENU(ID_LiveUpdate, MyFrame::OnManagerFlag)
|
||||
EVT_MENU(ID_AllowActivePane, MyFrame::OnManagerFlag)
|
||||
EVT_MENU(ID_NotebookTabFixedWidth, MyFrame::OnNotebookFlag)
|
||||
EVT_MENU(ID_NotebookNoCloseButton, MyFrame::OnNotebookFlag)
|
||||
@@ -637,6 +639,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
|
||||
EVT_UPDATE_UI(ID_HintFade, MyFrame::OnUpdateUI)
|
||||
EVT_UPDATE_UI(ID_NoVenetianFade, MyFrame::OnUpdateUI)
|
||||
EVT_UPDATE_UI(ID_TransparentDrag, MyFrame::OnUpdateUI)
|
||||
EVT_UPDATE_UI(ID_LiveUpdate, MyFrame::OnUpdateUI)
|
||||
EVT_UPDATE_UI(ID_NoGradient, MyFrame::OnUpdateUI)
|
||||
EVT_UPDATE_UI(ID_VerticalGradient, MyFrame::OnUpdateUI)
|
||||
EVT_UPDATE_UI(ID_HorizontalGradient, MyFrame::OnUpdateUI)
|
||||
@@ -699,6 +702,7 @@ MyFrame::MyFrame(wxWindow* parent,
|
||||
options_menu->AppendCheckItem(ID_NoVenetianFade, _("Disable Venetian Blinds Hint Fade-in"));
|
||||
options_menu->AppendCheckItem(ID_TransparentDrag, _("Transparent Drag"));
|
||||
options_menu->AppendCheckItem(ID_AllowActivePane, _("Allow Active Pane"));
|
||||
options_menu->AppendCheckItem(ID_LiveUpdate, _("Live Resize Update"));
|
||||
options_menu->AppendSeparator();
|
||||
options_menu->AppendRadioItem(ID_NoGradient, _("No Caption Gradient"));
|
||||
options_menu->AppendRadioItem(ID_VerticalGradient, _("Vertical Caption Gradient"));
|
||||
@@ -1078,6 +1082,7 @@ void MyFrame::OnManagerFlag(wxCommandEvent& event)
|
||||
case ID_TransparentHint: flag = wxAUI_MGR_TRANSPARENT_HINT; break;
|
||||
case ID_VenetianBlindsHint: flag = wxAUI_MGR_VENETIAN_BLINDS_HINT; break;
|
||||
case ID_RectangleHint: flag = wxAUI_MGR_RECTANGLE_HINT; break;
|
||||
case ID_LiveUpdate: flag = wxAUI_MGR_LIVE_RESIZE; break;
|
||||
}
|
||||
|
||||
if (flag)
|
||||
@@ -1191,6 +1196,9 @@ void MyFrame::OnUpdateUI(wxUpdateUIEvent& event)
|
||||
case ID_TransparentHint:
|
||||
event.Check((flags & wxAUI_MGR_TRANSPARENT_HINT) != 0);
|
||||
break;
|
||||
case ID_LiveUpdate:
|
||||
event.Check((flags & wxAUI_MGR_LIVE_RESIZE) != 0);
|
||||
break;
|
||||
case ID_VenetianBlindsHint:
|
||||
event.Check((flags & wxAUI_MGR_VENETIAN_BLINDS_HINT) != 0);
|
||||
break;
|
||||
|
||||
+238
-193
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user