This is an automated email from the git hooks/post-receive script. thansen pushed a commit to branch master in repository aseprite.
commit 1209037b0258f2017be9fadd0ba0b553bd90f9f0 Author: David Capello <[email protected]> Date: Thu Mar 17 16:08:08 2016 -0300 Rename app::ColorSelector -> app::ColorPopup --- src/app/CMakeLists.txt | 2 +- src/app/commands/cmd_palette_editor.cpp | 4 +-- src/app/ui/color_button.cpp | 11 +++--- src/app/ui/color_button.h | 6 ++-- src/app/ui/{color_selector.cpp => color_popup.cpp} | 41 +++++++++++----------- src/app/ui/{color_selector.h => color_popup.h} | 14 ++++---- 6 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 5d3f1a5..668951d 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -337,7 +337,7 @@ add_library(app-lib ui/button_set.cpp ui/color_bar.cpp ui/color_button.cpp - ui/color_selector.cpp + ui/color_popup.cpp ui/color_sliders.cpp ui/color_spectrum.cpp ui/color_tint_shade_tone.cpp diff --git a/src/app/commands/cmd_palette_editor.cpp b/src/app/commands/cmd_palette_editor.cpp index 140fe81..7270f1b 100644 --- a/src/app/commands/cmd_palette_editor.cpp +++ b/src/app/commands/cmd_palette_editor.cpp @@ -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 @@ -235,7 +235,7 @@ bool PaletteEditorCommand::onChecked(Context* context) ////////////////////////////////////////////////////////////////////// // PaletteEntryEditor implementation // -// Based on ColorSelector class. +// Based on ColorPopup class. PaletteEntryEditor::PaletteEntryEditor() : Window(WithTitleBar, "Palette Editor (F4)") diff --git a/src/app/ui/color_button.cpp b/src/app/ui/color_button.cpp index cdaa429..edb87e9 100644 --- a/src/app/ui/color_button.cpp +++ b/src/app/ui/color_button.cpp @@ -9,6 +9,8 @@ #include "config.h" #endif +#include "app/ui/color_button.h" + #include "app/app.h" #include "app/color.h" #include "app/color_picker.h" @@ -17,8 +19,7 @@ #include "app/modules/gfx.h" #include "app/modules/gui.h" #include "app/ui/color_bar.h" -#include "app/ui/color_button.h" -#include "app/ui/color_selector.h" +#include "app/ui/color_popup.h" #include "app/ui/editor/editor.h" #include "app/ui/skin/skin_theme.h" #include "app/ui/status_bar.h" @@ -85,7 +86,7 @@ void ColorButton::setColor(const app::Color& color) // Change the color in its related window if (m_window) - m_window->setColor(m_color, ColorSelector::DoNotChangeType); + m_window->setColor(m_color, ColorPopup::DoNotChangeType); // Emit signal Change(color); @@ -249,11 +250,11 @@ void ColorButton::openSelectorDialog() int x, y; if (m_window == NULL) { - m_window = new ColorSelector(); + m_window = new ColorPopup(); m_window->ColorChange.connect(&ColorButton::onWindowColorChange, this); } - m_window->setColor(m_color, ColorSelector::ChangeType); + m_window->setColor(m_color, ColorPopup::ChangeType); m_window->openWindow(); x = MID(0, bounds().x, ui::display_w()-m_window->bounds().w); diff --git a/src/app/ui/color_button.h b/src/app/ui/color_button.h index a04ae6f..7507f28 100644 --- a/src/app/ui/color_button.h +++ b/src/app/ui/color_button.h @@ -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 @@ -16,7 +16,7 @@ #include "ui/button.h" namespace app { - class ColorSelector; + class ColorPopup; class ColorButton : public ui::ButtonBase , public doc::ContextObserver { @@ -48,7 +48,7 @@ namespace app { app::Color m_color; PixelFormat m_pixelFormat; - ColorSelector* m_window; + ColorPopup* m_window; bool m_dependOnLayer; }; diff --git a/src/app/ui/color_selector.cpp b/src/app/ui/color_popup.cpp similarity index 81% rename from src/app/ui/color_selector.cpp rename to src/app/ui/color_popup.cpp index a81ac75..16af5ab 100644 --- a/src/app/ui/color_selector.cpp +++ b/src/app/ui/color_popup.cpp @@ -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 @@ -9,7 +9,7 @@ #include "config.h" #endif -#include <vector> +#include "app/ui/color_popup.h" #include "app/app.h" #include "app/cmd/set_palette.h" @@ -22,7 +22,6 @@ #include "app/modules/gui.h" #include "app/modules/palettes.h" #include "app/transaction.h" -#include "app/ui/color_selector.h" #include "app/ui/palette_view.h" #include "app/ui/skin/skin_theme.h" #include "app/ui/skin/style.h" @@ -49,7 +48,7 @@ enum { MASK_MODE }; -ColorSelector::ColorSelector() +ColorPopup::ColorPopup() : PopupWindowPin("Color Selector", ClickBehavior::CloseOnClickInOtherWindow) , m_vbox(VERTICAL) , m_topBox(HORIZONTAL) @@ -89,28 +88,28 @@ ColorSelector::ColorSelector() m_vbox.addChild(&m_maskLabel); addChild(&m_vbox); - m_colorType.ItemChange.connect(base::Bind<void>(&ColorSelector::onColorTypeClick, this)); + m_colorType.ItemChange.connect(base::Bind<void>(&ColorPopup::onColorTypeClick, this)); - m_rgbSliders.ColorChange.connect(&ColorSelector::onColorSlidersChange, this); - m_hsvSliders.ColorChange.connect(&ColorSelector::onColorSlidersChange, this); - m_graySlider.ColorChange.connect(&ColorSelector::onColorSlidersChange, this); - m_hexColorEntry.ColorChange.connect(&ColorSelector::onColorHexEntryChange, this); + m_rgbSliders.ColorChange.connect(&ColorPopup::onColorSlidersChange, this); + m_hsvSliders.ColorChange.connect(&ColorPopup::onColorSlidersChange, this); + m_graySlider.ColorChange.connect(&ColorPopup::onColorSlidersChange, this); + m_hexColorEntry.ColorChange.connect(&ColorPopup::onColorHexEntryChange, this); selectColorType(app::Color::RgbType); setSizeHint(gfx::Size(300*guiscale(), sizeHint().h)); m_onPaletteChangeConn = - App::instance()->PaletteChange.connect(&ColorSelector::onPaletteChange, this); + App::instance()->PaletteChange.connect(&ColorPopup::onPaletteChange, this); initTheme(); } -ColorSelector::~ColorSelector() +ColorPopup::~ColorPopup() { getPin()->parent()->removeChild(getPin()); } -void ColorSelector::setColor(const app::Color& color, SetColorOptions options) +void ColorPopup::setColor(const app::Color& color, SetColorOptions options) { m_color = color; @@ -129,23 +128,23 @@ void ColorSelector::setColor(const app::Color& color, SetColorOptions options) selectColorType(m_color.getType()); } -app::Color ColorSelector::getColor() const +app::Color ColorPopup::getColor() const { return m_color; } -void ColorSelector::onPaletteViewIndexChange(int index, ui::MouseButtons buttons) +void ColorPopup::onPaletteViewIndexChange(int index, ui::MouseButtons buttons) { setColorWithSignal(app::Color::fromIndex(index)); } -void ColorSelector::onColorSlidersChange(ColorSlidersChangeEvent& ev) +void ColorPopup::onColorSlidersChange(ColorSlidersChangeEvent& ev) { setColorWithSignal(ev.color()); findBestfitIndex(ev.color()); } -void ColorSelector::onColorHexEntryChange(const app::Color& color) +void ColorPopup::onColorHexEntryChange(const app::Color& color) { // Disable updating the hex entry so we don't override what the user // is writting in the text field. @@ -157,7 +156,7 @@ void ColorSelector::onColorHexEntryChange(const app::Color& color) m_disableHexUpdate = false; } -void ColorSelector::onColorTypeClick() +void ColorPopup::onColorTypeClick() { app::Color newColor = getColor(); @@ -189,13 +188,13 @@ void ColorSelector::onColorTypeClick() setColorWithSignal(newColor); } -void ColorSelector::onPaletteChange() +void ColorPopup::onPaletteChange() { setColor(getColor(), DoNotChangeType); invalidate(); } -void ColorSelector::findBestfitIndex(const app::Color& color) +void ColorPopup::findBestfitIndex(const app::Color& color) { // Find bestfit palette entry int r = color.getRed(); @@ -211,7 +210,7 @@ void ColorSelector::findBestfitIndex(const app::Color& color) } } -void ColorSelector::setColorWithSignal(const app::Color& color) +void ColorPopup::setColorWithSignal(const app::Color& color) { setColor(color, ChangeType); @@ -219,7 +218,7 @@ void ColorSelector::setColorWithSignal(const app::Color& color) ColorChange(color); } -void ColorSelector::selectColorType(app::Color::Type type) +void ColorPopup::selectColorType(app::Color::Type type) { m_colorPaletteContainer.setVisible(type == app::Color::IndexType); m_rgbSliders.setVisible(type == app::Color::RgbType); diff --git a/src/app/ui/color_selector.h b/src/app/ui/color_popup.h similarity index 88% rename from src/app/ui/color_selector.h rename to src/app/ui/color_popup.h index 1622837..981e15f 100644 --- a/src/app/ui/color_selector.h +++ b/src/app/ui/color_popup.h @@ -1,12 +1,12 @@ // 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 // published by the Free Software Foundation. -#ifndef APP_UI_COLOR_SELECTOR_H_INCLUDED -#define APP_UI_COLOR_SELECTOR_H_INCLUDED +#ifndef APP_UI_COLOR_POPUP_H_INCLUDED +#define APP_UI_COLOR_POPUP_H_INCLUDED #pragma once #include "app/color.h" @@ -24,16 +24,16 @@ namespace app { class PaletteIndexChangeEvent; - class ColorSelector : public PopupWindowPin - , public PaletteViewDelegate { + class ColorPopup : public PopupWindowPin + , public PaletteViewDelegate { public: enum SetColorOptions { ChangeType, DoNotChangeType }; - ColorSelector(); - ~ColorSelector(); + ColorPopup(); + ~ColorPopup(); void setColor(const app::Color& color, SetColorOptions options); app::Color getColor() const; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
