diff options
| author | Tomasz Boczkowski <penginsbacon@gmail.com> | 2014-05-23 09:09:05 +0000 |
|---|---|---|
| committer | Tomasz Boczkowski <penginsbacon@gmail.com> | 2014-05-23 09:09:05 +0000 |
| commit | a06f51f786230bfd26ddd34d27be438d4bebbd04 (patch) | |
| tree | fe7754c7e976e5b76e9fd03ea80c81feaa9d7b39 /src/ui/widget | |
| parent | SPColorSlider c++-sification: added ColorSlider class (diff) | |
| download | inkscape-a06f51f786230bfd26ddd34d27be438d4bebbd04.tar.gz inkscape-a06f51f786230bfd26ddd34d27be438d4bebbd04.zip | |
moved widgets/sp-color-slider to ui/widget/color-slider
(bzr r13341.6.2)
Diffstat (limited to '')
| -rw-r--r-- | src/ui/widget/Makefile_insert | 2 | ||||
| -rw-r--r-- | src/ui/widget/color-slider.cpp (renamed from src/widgets/sp-color-slider.cpp) | 14 | ||||
| -rw-r--r-- | src/ui/widget/color-slider.h (renamed from src/widgets/sp-color-slider.h) | 12 |
3 files changed, 19 insertions, 9 deletions
diff --git a/src/ui/widget/Makefile_insert b/src/ui/widget/Makefile_insert index 608dd5334..6deaf6671 100644 --- a/src/ui/widget/Makefile_insert +++ b/src/ui/widget/Makefile_insert @@ -10,6 +10,8 @@ ink_common_sources += \ ui/widget/color-picker.h \ ui/widget/color-preview.cpp \ ui/widget/color-preview.h \ + ui/widget/color-slider.cpp \ + ui/widget/color-slider.h \ ui/widget/combo-enums.h \ ui/widget/dock.h \ ui/widget/dock.cpp \ diff --git a/src/widgets/sp-color-slider.cpp b/src/ui/widget/color-slider.cpp index 07e1d79fb..430239f00 100644 --- a/src/widgets/sp-color-slider.cpp +++ b/src/ui/widget/color-slider.cpp @@ -15,20 +15,23 @@ # include "config.h" #endif -#include "sp-color-slider.h" +#include "color-slider.h" #include <gtk/gtk.h> #include <gdkmm/screen.h> #include <gdkmm/general.h> #include <gtkmm/adjustment.h> -#include "sp-color-scales.h" +#include "widgets/sp-color-scales.h" #include "preferences.h" static const gint SLIDER_WIDTH = 96; static const gint SLIDER_HEIGHT = 8; static const gint ARROW_SIZE = 7; +namespace Inkscape { +namespace UI { +namespace Widget { ColorSlider::ColorSlider(Gtk::Adjustment* adjustment) : _dragging(false) @@ -178,10 +181,9 @@ bool ColorSlider::on_draw(const Cairo::RefPtr<Cairo::Context>& cr) { return false; } - - - - +}//namespace Widget +}//namespace UI +}//namespace Inkscape diff --git a/src/widgets/sp-color-slider.h b/src/ui/widget/color-slider.h index 6821c8fe4..d8be7d111 100644 --- a/src/widgets/sp-color-slider.h +++ b/src/ui/widget/color-slider.h @@ -18,9 +18,14 @@ #endif #include <gtkmm/widget.h> - #include <sigc++/signal.h> +namespace Inkscape +{ +namespace UI +{ +namespace Widget +{ /* * A slider with colored background @@ -81,8 +86,9 @@ private: Glib::RefPtr<Gdk::Window> _refGdkWindow; }; - - +}//namespace Widget +}//namespace UI +}//namespace Inkscape #include <gtk/gtk.h> |