iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Move AddSeparator to VisualTool::SetToolbar 

Co-authored-by: wangqr <wangqr@wangqr.tk>
This commit is contained in:
Ryan 2021-03-27 08:09:11 -04:00
parent c218db6f34
commit 1246534b7b
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/video_display.cpp
View File

@ -415,7 +415,6 @@ void VideoDisplay::SetTool(std::unique_ptr<VisualToolBase> new_tool) {
// Hide the tool bar first to eliminate unecessary size changes // Hide the tool bar first to eliminate unecessary size changes
toolBar->Show(false); toolBar->Show(false);
toolBar->ClearTools(); toolBar->ClearTools();
toolBar->AddSeparator();
tool->SetToolbar(toolBar); tool->SetToolbar(toolBar);
// Update size as the new typesetting tool may have changed the subtoolbar size // Update size as the new typesetting tool may have changed the subtoolbar size

1
src/visual_tool_drag.cpp
View File

@ -54,6 +54,7 @@ VisualToolDrag::VisualToolDrag(VideoDisplay *parent, agi::Context *context)
void VisualToolDrag::SetToolbar(wxToolBar *tb) { void VisualToolDrag::SetToolbar(wxToolBar *tb) {
toolbar = tb; toolbar = tb;
toolbar->AddSeparator();
toolbar->AddTool(-1, _("Toggle between \\move and \\pos"), ICON(visual_move_conv_move)); toolbar->AddTool(-1, _("Toggle between \\move and \\pos"), ICON(visual_move_conv_move));
toolbar->Realize(); toolbar->Realize();
toolbar->Show(true); toolbar->Show(true);

2
src/visual_tool_vector_clip.cpp
View File

@ -52,6 +52,8 @@ VisualToolVectorClip::VisualToolVectorClip(VideoDisplay *parent, agi::Context *c
void VisualToolVectorClip::SetToolbar(wxToolBar *toolBar) { void VisualToolVectorClip::SetToolbar(wxToolBar *toolBar) {
this->toolBar = toolBar; this->toolBar = toolBar;
toolBar->AddSeparator();
int icon_size = OPT_GET("App/Toolbar Icon Size")->GetInt(); int icon_size = OPT_GET("App/Toolbar Icon Size")->GetInt();
#define ICON(name) icon_size == 16 ? GETIMAGE(name ## _16) : GETIMAGE(name ## _24) #define ICON(name) icon_size == 16 ? GETIMAGE(name ## _16) : GETIMAGE(name ## _24)