projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Another approach for stuck splash-screens:
[ardour.git]
/
gtk2_ardour
/
control_point.cc
diff --git
a/gtk2_ardour/control_point.cc
b/gtk2_ardour/control_point.cc
index 9b588d1babadc97b530dcee308dbf5c7783a44a4..2a457c52f1ec487a19fcb06c375ccdb5d5644859 100644
(file)
--- a/
gtk2_ardour/control_point.cc
+++ b/
gtk2_ardour/control_point.cc
@@
-19,12
+19,12
@@
#include "control_point.h"
#include "automation_line.h"
#include "control_point.h"
#include "automation_line.h"
-#include "ardour_ui.h"
#include "public_editor.h"
#include "public_editor.h"
+#include "ui_config.h"
#include "canvas/rectangle.h"
#include "canvas/rectangle.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace std;
using namespace ARDOUR;
using namespace std;
using namespace ARDOUR;
@@
-45,8
+45,8
@@
ControlPoint::ControlPoint (AutomationLine& al)
_item = new ArdourCanvas::Rectangle (&_line.canvas_group());
_item->set_fill (true);
_item = new ArdourCanvas::Rectangle (&_line.canvas_group());
_item->set_fill (true);
- _item->set_fill_color (
ARDOUR_UI::config()->get_canvasvar_ControlPointFill(
));
- _item->set_outline_color (
ARDOUR_UI::config()->get_canvasvar_ControlPointOutline(
));
+ _item->set_fill_color (
UIConfiguration::instance().color ("control point fill"
));
+ _item->set_outline_color (
UIConfiguration::instance().color ("control point outline"
));
_item->set_data ("control_point", this);
_item->Event.connect (sigc::mem_fun (this, &ControlPoint::event_handler));
_item->set_data ("control_point", this);
_item->Event.connect (sigc::mem_fun (this, &ControlPoint::event_handler));
@@
-70,7
+70,7
@@
ControlPoint::ControlPoint (const ControlPoint& other, bool /*dummy_arg_to_force
_item = new ArdourCanvas::Rectangle (&_line.canvas_group());
_item->set_fill (true);
_item = new ArdourCanvas::Rectangle (&_line.canvas_group());
_item->set_fill (true);
- _item->set_outline_color (
ARDOUR_UI::config()->get_canvasvar_ControlPointOutline(
));
+ _item->set_outline_color (
UIConfiguration::instance().color ("control point outline"
));
/* NOTE: no event handling in copied ControlPoints */
/* NOTE: no event handling in copied ControlPoints */
@@
-80,7
+80,7
@@
ControlPoint::ControlPoint (const ControlPoint& other, bool /*dummy_arg_to_force
ControlPoint::~ControlPoint ()
{
CatchDeletion (this); /* EMIT SIGNAL */
ControlPoint::~ControlPoint ()
{
CatchDeletion (this); /* EMIT SIGNAL */
-
+
delete _item;
}
delete _item;
}
@@
-119,16
+119,13
@@
ControlPoint::reset (double x, double y, AutomationList::iterator mi, uint32_t v
void
ControlPoint::set_color ()
{
void
ControlPoint::set_color ()
{
- uint32_t color = 0;
-
if (_selected) {
if (_selected) {
- color = ARDOUR_UI::config()->get_canvasvar_ControlPointSelected();
+ _item->set_outline_color(UIConfiguration::instance().color ("control point selected outline"));;
+ _item->set_fill_color(UIConfiguration::instance().color ("control point selected fill"));
} else {
} else {
- color = ARDOUR_UI::config()->get_canvasvar_ControlPointOutline();
+ _item->set_outline_color(UIConfiguration::instance().color ("control point outline"));
+ _item->set_fill_color(UIConfiguration::instance().color ("control point fill"));
}
}
-
- _item->set_outline_color (color);
- _item->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ControlPointFill());
}
void
}
void
@@
-167,8
+164,8
@@
ControlPoint::move_to (double x, double y, ShapeType shape)
_shape = shape;
}
_shape = shape;
}
-void
-ControlPoint::i
2w (double& x, double& y
) const
+ArdourCanvas::Item&
+ControlPoint::i
tem(
) const
{
{
-
_item->item_to_canvas (x, y)
;
+
return *_item
;
}
}