ardour/livetrax
13
0
Fork 0
Code

allow derived children of BarController to set label position as a width fraction, not an absolute position

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8597 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-01-28 01:04:33 +00:00
parent 4d1d355720
commit 9a87f854f7
6 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk2_ardour/automation_controller.cc
View File

@ -85,8 +85,9 @@ AutomationController::create(
}
std::string
AutomationController::get_label (int&)
AutomationController::get_label (double& xpos)
{
xpos = 0.5;
return _owner->value_as_string (_controllable);
}

2
gtk2_ardour/automation_controller.h
View File

@ -55,7 +55,7 @@ public:
private:
AutomationController (boost::shared_ptr<ARDOUR::Automatable> parent, boost::shared_ptr<ARDOUR::AutomationControl> ac, Gtk::Adjustment* adj);
std::string get_label (int&);
std::string get_label (double&);
void start_touch();
void end_touch();

2
gtk2_ardour/latency_gui.cc
View File

@ -25,7 +25,7 @@ static const gchar *_unit_strings[] = {
std::vector<std::string> LatencyGUI::unit_strings;
std::string
LatencyBarController::get_label (int&)
LatencyBarController::get_label (double&)
{
double const nframes = _latency_gui->adjustment.get_value();
std::stringstream s;

2
gtk2_ardour/latency_gui.h
View File

@ -32,7 +32,7 @@ public:
private:
LatencyGUI* _latency_gui;
std::string get_label (int&);
std::string get_label (double&);
};
class LatencyGUI : public Gtk::VBox

12
libs/gtkmm2ext/barcontroller.cc
View File

@ -391,23 +391,25 @@ BarController::expose (GdkEventExpose* /*event*/)
/* draw label */
int xpos = -1;
double xpos = -1;
std::string const label = get_label (xpos);
if (!label.empty()) {
layout->set_text (label);
int width, height;
int width, height, x;
layout->get_pixel_size (width, height);
if (xpos == -1) {
xpos = max (3, 1 + (x2 - (width/2)));
xpos = min (darea.get_width() - width - 3, xpos);
x = max (3, 1 + (x2 - (width/2)));
x = min (darea.get_width() - width - 3, (int) lrint (xpos));
} else {
x = lrint (darea.get_width() * xpos);
}
win->draw_layout (get_style()->get_text_gc (get_state()),
xpos,
x,
(darea.get_height()/2) - (height/2),
layout);
}

2
libs/gtkmm2ext/gtkmm2ext/barcontroller.h
View File

@ -85,7 +85,7 @@ class BarController : public Gtk::Frame
sigc::slot<std::string> _label_slot;
bool _use_slot;
virtual std::string get_label (int& /*x*/) {
virtual std::string get_label (double& /*x*/) {
return "";
}