mirror of https://github.com/aseprite/aseprite.git
				
				
				
			Include StatusBar in the set of customizable widgets in the layout
This commit is contained in:
		
							parent
							
								
									ec95c13a6b
								
							
						
					
					
						commit
						375a77d2f6
					
				|  | @ -15,6 +15,7 @@ | ||||||
| #include "app/ui/context_bar.h" | #include "app/ui/context_bar.h" | ||||||
| #include "app/ui/dock.h" | #include "app/ui/dock.h" | ||||||
| #include "app/ui/main_window.h" | #include "app/ui/main_window.h" | ||||||
|  | #include "app/ui/status_bar.h" | ||||||
| #include "app/ui/timeline/timeline.h" | #include "app/ui/timeline/timeline.h" | ||||||
| #include "app/ui/toolbar.h" | #include "app/ui/toolbar.h" | ||||||
| #include "app/ui/workspace.h" | #include "app/ui/workspace.h" | ||||||
|  | @ -120,6 +121,9 @@ static void load_dock_layout(const TiXmlElement* elem, Dock* dock) | ||||||
|   else if (elemName == "workspace") { |   else if (elemName == "workspace") { | ||||||
|     widget = win->getWorkspace(); |     widget = win->getWorkspace(); | ||||||
|   } |   } | ||||||
|  |   else if (elemName == "statusbar") { | ||||||
|  |     widget = win->statusBar(); | ||||||
|  |   } | ||||||
|   else if (elemName == "dock") { |   else if (elemName == "dock") { | ||||||
|     subdock = dock->subdock(side); |     subdock = dock->subdock(side); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|  | @ -160,6 +160,7 @@ void MainWindow::initialize() | ||||||
|   // constructor).
 |   // constructor).
 | ||||||
|   m_colorBar->setId("colorbar"); |   m_colorBar->setId("colorbar"); | ||||||
|   m_contextBar->setId("contextbar"); |   m_contextBar->setId("contextbar"); | ||||||
|  |   m_statusBar->setId("statusbar"); | ||||||
|   m_timeline->setId("timeline"); |   m_timeline->setId("timeline"); | ||||||
|   m_toolBar->setId("toolbar"); |   m_toolBar->setId("toolbar"); | ||||||
|   m_workspace->setId("workspace"); |   m_workspace->setId("workspace"); | ||||||
|  | @ -181,7 +182,6 @@ void MainWindow::initialize() | ||||||
|   m_dock->top()->dock(ui::BOTTOM, m_tabsBar.get()); |   m_dock->top()->dock(ui::BOTTOM, m_tabsBar.get()); | ||||||
|   m_dock->top()->dock(ui::CENTER, m_menuBar.get()); |   m_dock->top()->dock(ui::CENTER, m_menuBar.get()); | ||||||
|   m_dock->dock(ui::CENTER, m_customizableDockPlaceholder.get()); |   m_dock->dock(ui::CENTER, m_customizableDockPlaceholder.get()); | ||||||
|   m_dock->dock(ui::BOTTOM, m_statusBar.get()); |  | ||||||
| 
 | 
 | ||||||
|   setDefaultLayout(); |   setDefaultLayout(); | ||||||
| 
 | 
 | ||||||
|  | @ -398,6 +398,7 @@ void MainWindow::setDefaultLayout() | ||||||
| 
 | 
 | ||||||
|   m_customizableDock->resetDocks(); |   m_customizableDock->resetDocks(); | ||||||
|   m_customizableDock->dock(ui::LEFT, m_colorBar.get(), gfx::Size(colorBarWidth, 0)); |   m_customizableDock->dock(ui::LEFT, m_colorBar.get(), gfx::Size(colorBarWidth, 0)); | ||||||
|  |   m_customizableDock->dock(ui::BOTTOM, m_statusBar.get()); | ||||||
|   m_customizableDock->center()->dock(ui::TOP, m_contextBar.get()); |   m_customizableDock->center()->dock(ui::TOP, m_contextBar.get()); | ||||||
|   m_customizableDock->center()->dock(ui::RIGHT, m_toolBar.get()); |   m_customizableDock->center()->dock(ui::RIGHT, m_toolBar.get()); | ||||||
|   m_customizableDock->center()->center()->dock(ui::BOTTOM, |   m_customizableDock->center()->center()->dock(ui::BOTTOM, | ||||||
|  | @ -418,6 +419,7 @@ void MainWindow::setDefaultMirrorLayout() | ||||||
| 
 | 
 | ||||||
|   m_customizableDock->resetDocks(); |   m_customizableDock->resetDocks(); | ||||||
|   m_customizableDock->dock(ui::RIGHT, m_colorBar.get(), gfx::Size(colorBarWidth, 0)); |   m_customizableDock->dock(ui::RIGHT, m_colorBar.get(), gfx::Size(colorBarWidth, 0)); | ||||||
|  |   m_customizableDock->dock(ui::BOTTOM, m_statusBar.get()); | ||||||
|   m_customizableDock->center()->dock(ui::TOP, m_contextBar.get()); |   m_customizableDock->center()->dock(ui::TOP, m_contextBar.get()); | ||||||
|   m_customizableDock->center()->dock(ui::LEFT, m_toolBar.get()); |   m_customizableDock->center()->dock(ui::LEFT, m_toolBar.get()); | ||||||
|   m_customizableDock->center()->center()->dock(ui::BOTTOM, |   m_customizableDock->center()->center()->dock(ui::BOTTOM, | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue