mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-29 01:20:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't focus context bar when we use selection behavior modifiers (fix #1103)

Browse Source
This commit is contained in:
David Capello 2016-05-02 12:25:51 -03:00
parent c99a187256
commit 918acb6bc8
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/ui/button_set.cpp
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2001-2015 David Capello
// Copyright (C) 2001-2016 David Capello
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -322,15 +322,15 @@ int ButtonSet::selectedItem() const
return -1;
}
void ButtonSet::setSelectedItem(int index)
void ButtonSet::setSelectedItem(int index, bool focusItem)
{
if (index >= 0 && index < (int)children().size())
setSelectedItem(static_cast<Item*>(at(index)));
setSelectedItem(static_cast<Item*>(at(index)), focusItem);
else
setSelectedItem(static_cast<Item*>(NULL));
setSelectedItem(static_cast<Item*>(nullptr), focusItem);
}
void ButtonSet::setSelectedItem(Item* item)
void ButtonSet::setSelectedItem(Item* item, bool focusItem)
{
if (!m_multipleSelection) {
if (item && item->isSelected())
@ -343,7 +343,8 @@ void ButtonSet::setSelectedItem(Item* item)
if (item) {
item->setSelected(!item->isSelected());
item->requestFocus();
if (focusItem)
item->requestFocus();
}
}

6
src/app/ui/button_set.h
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2001-2015 David Capello
// Copyright (C) 2001-2016 David Capello
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -44,8 +44,8 @@ namespace app {
Item* getItem(int index);
int selectedItem() const;
void setSelectedItem(int index);
void setSelectedItem(Item* item);
void setSelectedItem(int index, bool focusItem = true);
void setSelectedItem(Item* item, bool focusItem = true);
void deselectItems();
void setOfferCapture(bool state);

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

@ -1112,7 +1112,7 @@ public:
}
void setSelectionMode(gen::SelectionMode mode) {
setSelectedItem((int)mode);
setSelectedItem((int)mode, false);
invalidate();
}