mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Move the visual tool submode buttons to the main visual tool toolbar

Browse source 
Creating an entire toolbar for one button in the drag mode is a
pointless waste of space and source of ugliness. The secondary toolbar
was more reasonable for the vector clip tool, but it's still a bit
pointless as there's enough space for it on the main toolbar at any
reasonable zoom level.

Closes #1401.

Originally committed to SVN as r6333.
This commit is contained in:
Thomas Goyne 2012-01-22 05:59:36 +00:00
parent d273255814
commit 6c879c12f1
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
aegisub/src/video_box.cpp
View file

@ -79,9 +79,6 @@ VideoBox::VideoBox(wxWindow *parent, bool isDetached, agi::Context *context)
: wxPanel (parent,-1) : wxPanel (parent,-1)
, context(context) , context(context)
{ {
// Visual controls sub-toolbar
wxToolBar *visualSubToolBar = new wxToolBar(this,-1,wxDefaultPosition,wxDefaultSize,wxTB_HORIZONTAL | wxTB_BOTTOM | wxTB_FLAT);
// Buttons // Buttons
wxSizer *videoBottomSizer = new wxBoxSizer(wxHORIZONTAL); wxSizer *videoBottomSizer = new wxBoxSizer(wxHORIZONTAL);
add_button(this, videoBottomSizer, "video/play", context); add_button(this, videoBottomSizer, "video/play", context);
@ -114,18 +111,26 @@ VideoBox::VideoBox(wxWindow *parent, bool isDetached, agi::Context *context)
visualToolBar->SetBackgroundStyle(wxBG_STYLE_COLOUR); visualToolBar->SetBackgroundStyle(wxBG_STYLE_COLOUR);
visualToolBar->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)); visualToolBar->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
// Visual controls sub-toolbar
wxToolBar *visualSubToolBar = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize, wxTB_VERTICAL | wxTB_BOTTOM | wxTB_FLAT);
visualSubToolBar->SetBackgroundStyle(wxBG_STYLE_COLOUR);
visualSubToolBar->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
VideoDisplay *videoDisplay = new VideoDisplay(visualSubToolBar, isDetached, zoomBox, this, context); VideoDisplay *videoDisplay = new VideoDisplay(visualSubToolBar, isDetached, zoomBox, this, context);
wxSizer *toolbarSizer = new wxBoxSizer(wxVERTICAL);
toolbarSizer->Add(visualToolBar, wxSizerFlags());
toolbarSizer->AddStretchSpacer();
toolbarSizer->Add(visualSubToolBar, wxSizerFlags());
// Top sizer // Top sizer
// Detached and attached video needs different flags, see bugs #742 and #853 // Detached and attached video needs different flags, see bugs #742 and #853
int highSizerFlags = isDetached ? wxEXPAND : 0; int highSizerFlags = isDetached ? wxEXPAND : 0;
wxSizer *topTopSizer = new wxBoxSizer(wxHORIZONTAL); wxSizer *topTopSizer = new wxBoxSizer(wxHORIZONTAL);
wxSizer *topSizer = new wxBoxSizer(wxVERTICAL); wxSizer *topSizer = new wxBoxSizer(wxVERTICAL);
visualSubToolBar->Show(false); topTopSizer->Add(toolbarSizer,0,wxEXPAND,0);
topTopSizer->Add(visualToolBar,0,highSizerFlags,0);
topTopSizer->Add(videoDisplay,1,highSizerFlags,0); topTopSizer->Add(videoDisplay,1,highSizerFlags,0);
topSizer->Add(topTopSizer,1,wxEXPAND,0); topSizer->Add(topTopSizer,1,wxEXPAND,0);
topSizer->Add(visualSubToolBar,0,wxEXPAND | wxBOTTOM,4);
topSizer->Add(new wxStaticLine(this),0,wxEXPAND,0); topSizer->Add(new wxStaticLine(this),0,wxEXPAND,0);
// Sizers // Sizers