mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-16 14:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of git@github.com:dacap/aseprite.git into dev

Browse Source
This commit is contained in:
David Capello 2013-11-21 00:28:16 -03:00
commit 88d8235e86
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/app.cpp
View File

@ -173,6 +173,10 @@ int App::run()
// Redraw the whole screen. // Redraw the whole screen.
ui::Manager::getDefault()->invalidate(); ui::Manager::getDefault()->invalidate();
// 2013-11-19 - JRM - Force setting active view to NULL, workaround for setting
// window title to proper devault value. (Issue #285)
UIContext::instance()->setActiveView(NULL);
} }
// Set background mode for non-GUI modes // Set background mode for non-GUI modes

2
src/app/commands/cmd_options.cpp
View File

@ -171,7 +171,7 @@ void OptionsCommand::onExecute(Context* context)
void OptionsCommand::onResetCheckedBg() void OptionsCommand::onResetCheckedBg()
{ {
// Default values // Default values
m_checked_bg->setSelectedItem((int)RenderEngine::CHECKED_BG_16X16); m_checked_bg->setSelectedItemIndex((int)RenderEngine::CHECKED_BG_16X16);
m_checked_bg_zoom->setSelected(true); m_checked_bg_zoom->setSelected(true);
m_checked_bg_color1->setColor(app::Color::fromRgb(128, 128, 128)); m_checked_bg_color1->setColor(app::Color::fromRgb(128, 128, 128));
m_checked_bg_color2->setColor(app::Color::fromRgb(192, 192, 192)); m_checked_bg_color2->setColor(app::Color::fromRgb(192, 192, 192));

2
src/app/ui/main_window.cpp
View File

@ -202,6 +202,8 @@ void MainWindow::onActiveViewChange()
{ {
if (DocumentView* docView = dynamic_cast<DocumentView*>(m_workspace->getActiveView())) if (DocumentView* docView = dynamic_cast<DocumentView*>(m_workspace->getActiveView()))
UIContext::instance()->setActiveView(docView); UIContext::instance()->setActiveView(docView);
else
UIContext::instance()->setActiveView(NULL);
} }
void MainWindow::clickTab(Tabs* tabs, TabView* tabView, ui::MouseButtons buttons) void MainWindow::clickTab(Tabs* tabs, TabView* tabView, ui::MouseButtons buttons)