mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-09-14 19:06:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add search field on palette popup

Browse Source
This commit is contained in:
David Capello 2017-05-30 15:46:54 -03:00
parent 399314b407
commit f4fc77e050
6 changed files with 62 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/strings/en.ini
View File

@ -407,7 +407,6 @@ replace_range = Replace current range
alpha_channel = Create entries with alpha component
[palette_popup]
title = Available Palettes:
load = &Load
open_folder = Open &Folder

4
data/widgets/palette_popup.xml
View File

@ -1,8 +1,8 @@
<!-- Aseprite -->
<!-- Copyright (C) 2014-2016 by David Capello -->
<!-- Copyright (C) 2014-2017 by David Capello -->
<gui>
<vbox id="palette_popup">
<label text="@.title" />
<search id="search" magnet="true" />
<view id="view" expansive="true" />
<hbox>
<button id="load_pal" text="@.load" width="80" magnet="true" />

34
src/app/ui/palette_popup.cpp
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2001-2016 David Capello
// Copyright (C) 2001-2017 David Capello
//
// This program is distributed under the terms of
// the End-User License Agreement for Aseprite.
@ -13,8 +13,10 @@
#include "app/commands/cmd_set_palette.h"
#include "app/commands/commands.h"
#include "app/launcher.h"
#include "app/match_words.h"
#include "app/res/palettes_loader_delegate.h"
#include "app/ui/palettes_listbox.h"
#include "app/ui/search_entry.h"
#include "app/ui_context.h"
#include "base/bind.h"
#include "ui/box.h"
@ -39,6 +41,7 @@ PalettePopup::PalettePopup()
addChild(m_popup);
m_paletteListBox.DoubleClickItem.connect(base::Bind<void>(&PalettePopup::onLoadPal, this));
m_popup->search()->Change.connect(base::Bind<void>(&PalettePopup::onSearchChange, this));
m_popup->loadPal()->Click.connect(base::Bind<void>(&PalettePopup::onLoadPal, this));
m_popup->openFolder()->Click.connect(base::Bind<void>(&PalettePopup::onOpenFolder, this));
@ -54,10 +57,7 @@ void PalettePopup::showPopup(const gfx::Rect& bounds)
moveWindow(bounds);
// Setup the hot-region
setHotRegion(gfx::Region(gfx::Rect(bounds).enlarge(32 * guiscale())));
openWindow();
openWindowInForeground();
}
void PalettePopup::onPalChange(doc::Palette* palette)
@ -67,6 +67,30 @@ void PalettePopup::onPalChange(doc::Palette* palette)
palette != NULL);
}
void PalettePopup::onSearchChange()
{
MatchWords match(m_popup->search()->text());
bool selected = false;
for (auto child : m_paletteListBox.children()) {
if (dynamic_cast<ResourceListItem*>(child)) {
const bool vis = match(child->text());
child->setVisible(vis);
if (!selected && vis) {
selected = true;
m_paletteListBox.selectChild(child);
}
}
else
child->setVisible(true);
}
if (!selected)
m_paletteListBox.selectChild(nullptr);
m_popup->view()->layout();
}
void PalettePopup::onLoadPal()
{
doc::Palette* palette = m_paletteListBox.selectedPalette();

3
src/app/ui/palette_popup.h
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2001-2015 David Capello
// Copyright (C) 2001-2017 David Capello
//
// This program is distributed under the terms of
// the End-User License Agreement for Aseprite.
@ -30,6 +30,7 @@ namespace app {
protected:
void onPalChange(doc::Palette* palette);
void onSearchChange();
void onLoadPal();
void onOpenFolder();

1
src/app/ui/palettes_listbox.cpp
View File

@ -60,6 +60,7 @@ class PalettesListItem : public ResourceListItem {
CommentButton(const std::string& comment)
: IconButton(SkinTheme::instance()->parts.iconUserData()->bitmap(0))
, m_comment(comment) {
setFocusStop(false);
}
private:

56
src/ui/manager.cpp
View File

@ -5,6 +5,7 @@
// Read LICENSE.txt for more information.
// #define REPORT_EVENTS
// #define REPORT_FOCUS_MOVEMENT
// #define DEBUG_PAINT_EVENTS
// #define LIMIT_DISPATCH_TIME
@ -32,8 +33,10 @@
#include <iostream>
#endif
#include <algorithm>
#include <limits>
#include <list>
#include <utility>
#include <vector>
namespace ui {
@ -75,7 +78,7 @@ static bool first_time = true; // true when we don't enter in poll yet
/* keyboard focus movement stuff */
static int count_widgets_accept_focus(Widget* widget);
static bool childs_accept_focus(Widget* widget, bool first);
static bool child_accept_focus(Widget* widget, bool first);
static Widget* next_widget(Widget* widget);
static int cmp_left(Widget* widget, int x, int y);
static int cmp_right(Widget* widget, int x, int y);
@ -820,7 +823,7 @@ void Manager::attractFocus(Widget* widget)
void Manager::focusFirstChild(Widget* widget)
{
for (Widget* it=widget->window(); it; it=next_widget(it)) {
if (ACCEPT_FOCUS(it) && !(childs_accept_focus(it, true))) {
if (ACCEPT_FOCUS(it) && !(child_accept_focus(it, true))) {
setFocus(it);
break;
}
@ -1547,7 +1550,7 @@ bool Manager::processFocusMovementMessage(Message* msg)
if (!window)
return false;
// How many child-widget want the focus in this widget?
// How many children want the focus in this window?
count = count_widgets_accept_focus(window);
// One at least
@ -1556,14 +1559,13 @@ bool Manager::processFocusMovementMessage(Message* msg)
c = 0;
/* list's 1st element is the focused widget */
// Create a list of possible candidates to receive the focus
for (it=focus_widget; it; it=next_widget(it)) {
if (ACCEPT_FOCUS(it) && !(childs_accept_focus(it, true)))
if (ACCEPT_FOCUS(it) && !(child_accept_focus(it, true)))
list[c++] = it;
}
for (it=window; it != focus_widget; it=next_widget(it)) {
if (ACCEPT_FOCUS(it) && !(childs_accept_focus(it, true)))
if (ACCEPT_FOCUS(it) && !(child_accept_focus(it, true)))
list[c++] = it;
}
@ -1590,32 +1592,32 @@ bool Manager::processFocusMovementMessage(Message* msg)
// More than one widget
if (count > 1) {
int i, j, x, y;
// Position where the focus come
x = ((focus_widget) ? focus_widget->bounds().x+focus_widget->bounds().x2():
window->bounds().x+window->bounds().x2())
/ 2;
y = ((focus_widget) ? focus_widget->bounds().y+focus_widget->bounds().y2():
window->bounds().y+window->bounds().y2())
/ 2;
gfx::Point pt = (focus_widget ? focus_widget->bounds().center():
window->bounds().center());
c = focus_widget ? 1: 0;
c = (focus_widget ? 1: 0);
// Rearrange the list
for (i=c; i<count-1; i++) {
for (j=i+1; j<count; j++) {
for (int i=c; i<count-1; ++i) {
for (int j=i+1; j<count; ++j) {
// Sort the list in ascending order
if ((*cmp)(list[i], x, y) > (*cmp)(list[j], x, y)) {
Widget* tmp = list[i];
list[i] = list[j];
list[j] = tmp;
}
if ((*cmp)(list[i], pt.x, pt.y) > (*cmp)(list[j], pt.x, pt.y))
std::swap(list[i], list[j]);
}
}
#ifdef REPORT_FOCUS_MOVEMENT
// Print list of widgets
for (int i=c; i<count-1; ++i) {
TRACE("list[%d] = %d (%s)\n",
i, (*cmp)(list[i], pt.x, pt.y),
typeid(*list[i]).name());
}
#endif
// Check if the new widget to put the focus is not in the wrong way.
if ((*cmp)(list[c], x, y) < std::numeric_limits<int>::max())
if ((*cmp)(list[c], pt.x, pt.y) < std::numeric_limits<int>::max())
focus = list[c];
}
// If only there are one widget, put the focus in this
@ -1635,8 +1637,6 @@ bool Manager::processFocusMovementMessage(Message* msg)
static int count_widgets_accept_focus(Widget* widget)
{
ASSERT(widget != NULL);
int count = 0;
for (auto child : widget->children())
@ -1648,10 +1648,10 @@ static int count_widgets_accept_focus(Widget* widget)
return count;
}
static bool childs_accept_focus(Widget* widget, bool first)
static bool child_accept_focus(Widget* widget, bool first)
{
for (auto child : widget->children())
if (childs_accept_focus(child, false))
if (child_accept_focus(child, false))
return true;
return (first ? false: ACCEPT_FOCUS(widget));