ardour/livetrax
13
0
Fork 0
Code

move big clock size variables into ARDOUR_UI; save&restore big clock size + position

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@6738 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-03-05 21:51:31 +00:00
parent 2d3e8ac20b
commit 4ffcec7b79
3 changed files with 108 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gtk2_ardour/ardour_ui.cc
View File

@ -214,6 +214,9 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
last_speed_displayed = -1.0f;
ignore_dual_punch = false;
_mixer_on_top = false;
original_big_clock_width = -1;
original_big_clock_height = -1;
original_big_clock_font_size = 0;
roll_button.unset_flags (Gtk::CAN_FOCUS);
stop_button.unset_flags (Gtk::CAN_FOCUS);
@ -548,6 +551,34 @@ ARDOUR_UI::save_ardour_state ()
XMLNode* node = new XMLNode (keyboard->get_state());
Config->add_extra_xml (*node);
Config->add_extra_xml (get_transport_controllable_state());
XMLNode* window_node = new XMLNode (X_("UI"));
window_node->add_property ("show-big-clock", (big_clock_window && big_clock_window->is_visible() ? "yes" : "no"));
Glib::RefPtr<Gdk::Window> win;
if (big_clock_window && (win = big_clock_window->get_window())) {
int w, h;
int xoff, yoff;
char buf[32];
win->get_size (w, h);
win->get_position (xoff, yoff);
snprintf (buf, sizeof (buf), "%d", w);
window_node->add_property ("big-clock-x-size", buf);
snprintf (buf, sizeof (buf), "%d", h);
window_node->add_property ("big-clock-y-size", buf);
snprintf (buf, sizeof (buf), "%d", xoff);
window_node->add_property ("big-clock-x-off", buf);
snprintf (buf, sizeof (buf), "%d", yoff);
window_node->add_property ("big-clock-y-off", buf);
}
Config->add_extra_xml (*window_node);
if (_startup && _startup->engine_control() && _startup->engine_control()->was_used()) {
Config->add_extra_xml (_startup->engine_control()->get_state());
}
@ -3344,6 +3375,17 @@ ARDOUR_UI::use_config ()
if (node) {
set_transport_controllable_state (*node);
}
node = Config->extra_xml (X_("UI"));
if (node) {
const XMLProperty* prop = node->property (X_("show-big-clock"));
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleBigClock"));
if (act) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
tact->set_active (string_is_affirmative (prop->value()));
}
}
}
void

4
gtk2_ardour/ardour_ui.h
View File

@ -314,6 +314,10 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
AudioClock big_clock;
Gtk::Window* big_clock_window;
int original_big_clock_width;
int original_big_clock_height;
double original_big_clock_font_size;
void big_clock_size_allocate (Gtk::Allocation&);
bool idle_big_clock_text_resizer (int width, int height);
void big_clock_realized ();

93
gtk2_ardour/ardour_ui_ed.cc
View File

@ -33,6 +33,7 @@
#include "pbd/file_utils.h"
#include "pbd/fpu.h"
#include "pbd/convert.h"
#include "ardour_ui.h"
#include "public_editor.h"
@ -552,9 +553,59 @@ ARDOUR_UI::setup_clock ()
void
ARDOUR_UI::big_clock_realized ()
{
set_decoration (big_clock_window, (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH));
int x, y, w, d;
set_decoration (big_clock_window, (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH));
big_clock_window->get_window()->get_geometry (x, y, w, big_clock_height, d);
original_big_clock_height = big_clock_height;
original_big_clock_width = w;
Pango::FontDescription fd (big_clock.get_style()->get_font());
original_big_clock_font_size = fd.get_size ();
if (!fd.get_size_is_absolute ()) {
original_big_clock_font_size /= PANGO_SCALE;
}
/* we can't set the real size until we know the original one, with the UI rc-file-set font
size, so do this here.
*/
XMLNode* node = Config->extra_xml (X_("UI"));
if (node) {
const XMLProperty* prop;
int w, h, x, y;
int have_pos = 0;
w = h = x = y = 0;
if ((prop = node->property ("big-clock-x-size")) != 0) {
w = atoi (prop->value());
}
if ((prop = node->property ("big-clock-y-size")) != 0) {
h = atoi (prop->value());
}
if (w && h) {
big_clock_window->set_default_size (w, h);
}
if ((prop = node->property ("big-clock-x-off")) != 0) {
x = atoi (prop->value());
have_pos++;
}
if ((prop = node->property ("big-clock-y-off")) != 0) {
y = atoi (prop->value());
have_pos++;
}
if (have_pos == 2) {
big_clock_window->move (x, y);
}
}
}
void
@ -576,14 +627,8 @@ ARDOUR_UI::big_clock_size_allocate (Gtk::Allocation& allocation)
Glib::signal_idle().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::idle_big_clock_text_resizer), 0, 0));
big_clock_resize_in_progress = true;
}
// big_clock_window->set_size_request (allocation.get_width() - 2, allocation.get_height() - 1);
}
static int old_big_clock_width = -1;
static int old_big_clock_height = -1;
static double big_clock_precise_font_size = 0;
bool
ARDOUR_UI::idle_big_clock_text_resizer (int win_w, int win_h)
{
@ -591,37 +636,23 @@ ARDOUR_UI::idle_big_clock_text_resizer (int win_w, int win_h)
Glib::RefPtr<Gdk::Window> win = big_clock_window->get_window();
Pango::FontDescription fd (big_clock.get_style()->get_font());
int size = fd.get_size ();
bool absolute = fd.get_size_is_absolute ();
int original_size;
int x, y, winw, winh, d;
int current_size = fd.get_size ();
int x, y, w, h, d;
if (!absolute) {
size /= PANGO_SCALE;
if (!fd.get_size_is_absolute ()) {
current_size /= PANGO_SCALE;
}
win->get_geometry (x, y, winw, winh, d);
win->get_geometry (x, y, w, h, d);
if (old_big_clock_width < 0 || old_big_clock_height < 0) {
old_big_clock_height = winh;
old_big_clock_width = winw;
big_clock_precise_font_size = size;
return false;
}
double scale = min (((double) w / (double) original_big_clock_width),
((double) h / (double) original_big_clock_height));
double scale;
int size = (int) lrintf (original_big_clock_font_size * scale);
scale = min (((double) winw / (double) old_big_clock_width),
((double) winh / (double) old_big_clock_height));
string family = fd.get_family();
original_size = size;
size = (int) lrintf (big_clock_precise_font_size * scale);
if (size != original_size) {
if (size != current_size) {
string family = fd.get_family();
char buf[family.length()+16];
snprintf (buf, family.length()+16, "%s %d", family.c_str(), size);