diff options
| author | Tomasz Boczkowski <penginsbacon@gmail.com> | 2015-04-26 17:51:08 +0000 |
|---|---|---|
| committer | Tomasz Boczkowski <penginsbacon@gmail.com> | 2015-04-26 17:51:08 +0000 |
| commit | 09c12ba65e2aa359603d3ed41a00624efd42693d (patch) | |
| tree | fe3469e0d8ae6aa897f5f1d549b24b2f77cfe3dd /src/widgets/paint-selector.h | |
| parent | merged SPColorICCSelector c++-sification from svgpaints branch (diff) | |
| parent | ColorNotebook is Gtk::Widget and uses ColorSelector (diff) | |
| download | inkscape-09c12ba65e2aa359603d3ed41a00624efd42693d.tar.gz inkscape-09c12ba65e2aa359603d3ed41a00624efd42693d.zip | |
Using SelectedColor instead of SPColorSelector
(bzr r14059.1.10)
Diffstat (limited to 'src/widgets/paint-selector.h')
| -rw-r--r-- | src/widgets/paint-selector.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/widgets/paint-selector.h b/src/widgets/paint-selector.h index 788aa673e..0e8a2967d 100644 --- a/src/widgets/paint-selector.h +++ b/src/widgets/paint-selector.h @@ -12,12 +12,22 @@ * */ +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + +#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H +#include <glibmm/threads.h> +#endif + +#include <glib.h> #include <gtk/gtk.h> #include "color.h" #include "fill-or-stroke.h" #include "sp-gradient-spread.h" #include "sp-gradient-units.h" +#include "ui/selected-color.h" class SPGradient; class SPDesktop; @@ -83,9 +93,8 @@ struct SPPaintSelector { GtkWidget *frame, *selector; GtkWidget *label; - SPColor color; - float alpha; - + Inkscape::UI::SelectedColor *selected_color; + bool updating_color; static Mode getModeForStyle(SPStyle const & style, FillOrStroke kind); @@ -114,6 +123,11 @@ struct SPPaintSelector { // TODO move this elsewhere: void setFlatColor( SPDesktop *desktop, const gchar *color_property, const gchar *opacity_property ); + + void onSelectedColorGrabbed(); + void onSelectedColorDragged(); + void onSelectedColorReleased(); + void onSelectedColorChanged(); }; enum {COMBO_COL_LABEL=0, COMBO_COL_STOCK=1, COMBO_COL_PATTERN=2, COMBO_COL_SEP=3, COMBO_N_COLS=4}; |