summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-12-01 23:08:55 +0000
committerDavid Robillard <d@drobilla.net>2011-12-01 23:08:55 +0000
commitebc5be60f0c7db0e6d0387cc6668b12232237751 (patch)
treef2b72dbc4529bd95de76bcd2ed61009488242f5a
parentc06607a48b86c00fb526228e737e978bcfa7602f (diff)
downloadingen-ebc5be60f0c7db0e6d0387cc6668b12232237751.tar.gz
ingen-ebc5be60f0c7db0e6d0387cc6668b12232237751.tar.bz2
ingen-ebc5be60f0c7db0e6d0387cc6668b12232237751.zip
Move color stuff down to C level.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3733 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/gui/App.cpp4
-rw-r--r--src/gui/NodeModule.cpp3
-rw-r--r--src/gui/PatchCanvas.cpp2
3 files changed, 3 insertions, 6 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 24e61e1e..dac6eeae 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -239,7 +239,7 @@ App::port_activity(Port* port)
if (inserted.second)
inserted.first->second = false;
- port->set_highlighted(true, false, true, false);
+ port->set_highlighted(true);
}
void
@@ -260,7 +260,7 @@ App::animate()
++next;
if ((*i).second) { // saw it last time, unhighlight and pop
- (*i).first->set_highlighted(false, false, true, false);
+ (*i).first->set_highlighted(false);
_activity_ports.erase(i);
} else {
(*i).second = true;
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index 386bea49..cc816872 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -248,9 +248,6 @@ NodeModule::embed_gui(bool embed)
if (embed && _embed_item) {
set_control_values();
- set_base_color(0x212222FF);
- } else {
- set_default_base_color();
}
}
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index 7256707a..960a4c30 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -471,7 +471,7 @@ PatchCanvas::connection(SharedPtr<const ConnectionModel> cm)
if (src && dst) {
new GUI::Connection(*this, cm, src, dst,
- src->color() + 0x22222200);
+ src->get_fill_color() + 0x22222200);
} else {
LOG(error) << "Unable to find ports to connect "
<< cm->src_port_path() << " -> " << cm->dst_port_path() << endl;