mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-04 13:59:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename PaletteView::clearSelection() -> deselect()

Browse Source
This commit is contained in:
David Capello 2015-05-10 19:23:30 -03:00
parent b5b59dece4
commit 38526f3b9e
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/ui/color_bar.cpp
View File

@ -159,7 +159,7 @@ ColorBar::ColorBar(int align)
setBgColor(get_config_color("ColorBar", "BG", getBgColor())); setBgColor(get_config_color("ColorBar", "BG", getBgColor()));
// Clear the selection of the BG color in the palette. // Clear the selection of the BG color in the palette.
m_paletteView.clearSelection(); m_paletteView.deselect();
// Set foreground color reading its value from the configuration. // Set foreground color reading its value from the configuration.
setFgColor(get_config_color("ColorBar", "FG", getFgColor())); setFgColor(get_config_color("ColorBar", "FG", getFgColor()));
@ -464,7 +464,7 @@ void ColorBar::onPaletteViewPasteColors(
void ColorBar::onFgColorButtonChange(const app::Color& color) void ColorBar::onFgColorButtonChange(const app::Color& color)
{ {
if (!m_lock) if (!m_lock)
m_paletteView.clearSelection(); m_paletteView.deselect();
FgColorChange(color); FgColorChange(color);
onColorButtonChange(color); onColorButtonChange(color);
@ -473,7 +473,7 @@ void ColorBar::onFgColorButtonChange(const app::Color& color)
void ColorBar::onBgColorButtonChange(const app::Color& color) void ColorBar::onBgColorButtonChange(const app::Color& color)
{ {
if (!m_lock) if (!m_lock)
m_paletteView.clearSelection(); m_paletteView.deselect();
BgColorChange(color); BgColorChange(color);
onColorButtonChange(color); onColorButtonChange(color);
@ -603,7 +603,7 @@ void ColorBar::destroyRemap()
void ColorBar::onNewInputPriority(InputChainElement* element) void ColorBar::onNewInputPriority(InputChainElement* element)
{ {
m_paletteView.clearSelection(); m_paletteView.deselect();
} }
bool ColorBar::onCanCut(Context* ctx) bool ColorBar::onCanCut(Context* ctx)
@ -662,7 +662,7 @@ bool ColorBar::onClear(Context* ctx)
void ColorBar::onCancel(Context* ctx) void ColorBar::onCancel(Context* ctx)
{ {
m_paletteView.clearSelection(); m_paletteView.deselect();
m_paletteView.discardClipboardSelection(); m_paletteView.discardClipboardSelection();
invalidate(); invalidate();
} }

4
src/app/ui/color_selector.cpp
View File

@ -132,7 +132,7 @@ void ColorSelector::setColor(const app::Color& color, SetColorOptions options)
m_color = color; m_color = color;
if (color.getType() == app::Color::IndexType) { if (color.getType() == app::Color::IndexType) {
m_colorPalette.clearSelection(); m_colorPalette.deselect();
m_colorPalette.selectColor(color.getIndex(), false); m_colorPalette.selectColor(color.getIndex(), false);
} }
@ -305,7 +305,7 @@ void ColorSelector::findBestfitIndex(const app::Color& color)
// Search for the closest color to the RGB values // Search for the closest color to the RGB values
int i = get_current_palette()->findBestfit(r, g, b); int i = get_current_palette()->findBestfit(r, g, b);
if (i >= 0 && i < 256) { if (i >= 0 && i < 256) {
m_colorPalette.clearSelection(); m_colorPalette.deselect();
m_colorPalette.selectColor(i, false); m_colorPalette.selectColor(i, false);
} }
} }

4
src/app/ui/palette_view.cpp
View File

@ -101,7 +101,7 @@ void PaletteView::setColumns(int columns)
} }
} }
void PaletteView::clearSelection() void PaletteView::deselect()
{ {
bool invalidate = (m_selectedEntries.picks() > 0); bool invalidate = (m_selectedEntries.picks() > 0);
@ -306,7 +306,7 @@ bool PaletteView::onProcessMessage(Message* msg)
if (hasCapture() && (idx != m_currentEntry || msg->type() == kMouseDownMessage)) { if (hasCapture() && (idx != m_currentEntry || msg->type() == kMouseDownMessage)) {
if (!msg->ctrlPressed()) if (!msg->ctrlPressed())
clearSelection(); deselect();
if (msg->type() == kMouseMoveMessage) if (msg->type() == kMouseMoveMessage)
selectRange(m_rangeAnchor, idx); selectRange(m_rangeAnchor, idx);

2
src/app/ui/palette_view.h
View File

@ -51,7 +51,7 @@ namespace app {
int getColumns() const { return m_columns; } int getColumns() const { return m_columns; }
void setColumns(int columns); void setColumns(int columns);
void clearSelection(); void deselect();
void selectColor(int index, bool startRange); void selectColor(int index, bool startRange);
void selectRange(int index1, int index2); void selectRange(int index1, int index2);