diff options
| author | Tomasz Boczkowski <penginsbacon@gmail.com> | 2014-06-01 09:06:36 +0000 |
|---|---|---|
| committer | Tomasz Boczkowski <penginsbacon@gmail.com> | 2014-06-01 09:06:36 +0000 |
| commit | 41d146e6c99b26bc5ce2a377fc70fe28e5bb8db5 (patch) | |
| tree | b9d3a2a7b2a116c7fed7cd327f856338986fff65 /src/widgets/sp-color-notebook.h | |
| parent | inhibit SelectedColor::setColorAlpha in the callbacks of it's signals (diff) | |
| download | inkscape-41d146e6c99b26bc5ce2a377fc70fe28e5bb8db5.tar.gz inkscape-41d146e6c99b26bc5ce2a377fc70fe28e5bb8db5.zip | |
SPColorNotebook cleanup
(bzr r13341.6.44)
Diffstat (limited to 'src/widgets/sp-color-notebook.h')
| -rw-r--r-- | src/widgets/sp-color-notebook.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/widgets/sp-color-notebook.h b/src/widgets/sp-color-notebook.h index ca9343bf0..cc3fb4c76 100644 --- a/src/widgets/sp-color-notebook.h +++ b/src/widgets/sp-color-notebook.h @@ -40,9 +40,6 @@ public: virtual void init(); - SPColorSelector* getCurrentSelector(); - void switchPage( GtkNotebook *notebook, GtkWidget *page, guint page_num ); - protected: struct Page { Page(Inkscape::UI::ColorSelectorFactory *selector_factory, bool enabled_full); @@ -51,11 +48,6 @@ protected: bool enabled_full; }; - static void _entryGrabbed( SPColorSelector *csel, SPColorNotebook *colorbook ); - static void _entryDragged( SPColorSelector *csel, SPColorNotebook *colorbook ); - static void _entryReleased( SPColorSelector *csel, SPColorNotebook *colorbook ); - static void _entryChanged( SPColorSelector *csel, SPColorNotebook *colorbook ); - static void _entryModified( SPColorSelector *csel, SPColorNotebook *colorbook ); static void _buttonClicked(GtkWidget *widget, SPColorNotebook *colorbook); static void _picker_clicked(GtkWidget *widget, SPColorNotebook *colorbook); @@ -66,15 +58,13 @@ protected: virtual void _onSelectedColorGrabbed(); virtual void _onSelectedColorReleased(); - void _updateRgbaEntry( const SPColor& color, gfloat alpha ); + void _updateICCButtons(); void _setCurrentPage(int i); GtkWidget* _addPage(Page& page); Inkscape::UI::SelectedColor _selected_color; gboolean _updating : 1; - gboolean _updatingrgba : 1; - gboolean _dragging : 1; gulong _switchId; gulong _entryId; GtkWidget *_book; |