diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-11-20 14:01:12 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-11-26 18:22:22 +0200 |
| commit | 137425faf1420e41231a11438c08efca3be40284 (patch) | |
| tree | 5a7f8cfe8d73a1c501fd94490db2d8da70b660ea /gtk2_ardour/ui_config.h | |
| parent | 7fc1152d31a0d4d80a20f08cef45ec8421a5947b (diff) | |
continue tweaks on the color road
Diffstat (limited to 'gtk2_ardour/ui_config.h')
| -rw-r--r-- | gtk2_ardour/ui_config.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h index 0754425c27..a89918d58d 100644 --- a/gtk2_ardour/ui_config.h +++ b/gtk2_ardour/ui_config.h @@ -85,7 +85,7 @@ class UIConfiguration : public PBD::Stateful static UIConfiguration* instance() { return _instance; } - std::map<std::string,ColorVariable<uint32_t> *> configurable_colors; + std::map<std::string,ColorVariable<ArdourCanvas::Color> *> configurable_colors; bool dirty () const; void set_dirty (); @@ -175,7 +175,7 @@ class UIConfiguration : public PBD::Stateful /* declare base color variables (these are modifiable by the user) */ #undef CANVAS_BASE_COLOR -#define CANVAS_BASE_COLOR(var,name,val) ColorVariable<uint32_t> var; +#define CANVAS_BASE_COLOR(var,name,val) ColorVariable<ArdourCanvas::Color> var; #include "base_colors.h" #undef CANVAS_BASE_COLOR @@ -193,7 +193,8 @@ class UIConfiguration : public PBD::Stateful void color_compute (); void print_relative_def (std::string camelcase, std::string name, ArdourCanvas::Color c); void color_theme_changed (); - void original_colors (); + void regenerate_relative_definitions (); + ArdourCanvas::Color quantized (ArdourCanvas::Color); }; #endif /* __ardour_ui_configuration_h__ */ |