#include "utils.h"
#include "canvas_impl.h"
#include "rgb_macros.h"
+#include "ardour_ui.h"
#include "i18n.h"
using namespace Editing;
using namespace Glib;
using namespace PBD;
+using namespace ARDOUR;
//------------------------------------------------------------------------------
/** Initialize const static memeber data */
-Pango::FontDescription TimeAxisViewItem::NAME_FONT;
+Pango::FontDescription* TimeAxisViewItem::NAME_FONT = 0;
bool TimeAxisViewItem::have_name_font = false;
const double TimeAxisViewItem::NAME_X_OFFSET = 15.0;
const double TimeAxisViewItem::GRAB_HANDLE_LENGTH = 6 ;
int width;
int height;
- layout->set_font_description (NAME_FONT);
+ layout->set_font_description (*NAME_FONT);
Gtkmm2ext::get_ink_pixel_size (layout, width, height);
- NAME_Y_OFFSET = height + 6;
+ NAME_Y_OFFSET = height + 5;
NAME_HIGHLIGHT_SIZE = height + 6;
NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 2;
TimeAxisViewItem::init (const string& it_name, double spu, Gdk::Color& base_color, nframes_t start, nframes_t duration, Visibility vis)
{
item_name = it_name ;
- name_text_width = ::pixel_width (it_name, NAME_FONT);
+ name_text_width = ::pixel_width (it_name, *NAME_FONT);
last_name_text_width = 0;
samples_per_unit = spu ;
should_show_selection = true;
frame_position = start ;
item_duration = duration ;
name_connected = false;
- fill_opacity = 60;
+ // why? fill_opacity = 60;
position_locked = false ;
max_item_duration = ARDOUR::max_frames;
min_item_duration = 0 ;
vestigial_frame->property_y1() = (double) 1.0;
vestigial_frame->property_x2() = 2.0;
vestigial_frame->property_y2() = (double) trackview.height;
- vestigial_frame->property_outline_color_rgba() = color_map[cVestigialFrameOutline];
- vestigial_frame->property_fill_color_rgba() = color_map[cVestigialFrameFill];
+ vestigial_frame->property_outline_what() = 0xF;
+ vestigial_frame->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_VestigialFrame.get();
+ vestigial_frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_VestigialFrame.get();
vestigial_frame->hide ();
if (visibility & ShowFrame) {
frame->property_y1() = (double) 1.0;
frame->property_x2() = (double) trackview.editor.frame_to_pixel(duration);
frame->property_y2() = (double) trackview.height;
- frame->property_outline_color_rgba() = color_map[cTimeAxisFrameOutline];
- frame->property_fill_color_rgba() = color_map[cTimeAxisFrameFill];
+ frame->property_outline_what() = 0xF;
+ frame->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get();
+ frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get();
/* by default draw all 4 edges */
}
name_highlight->property_y1() = (double) (trackview.height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE);
name_highlight->property_y2() = (double) (trackview.height - 1);
- name_highlight->property_outline_color_rgba() = color_map[cNameHighlightFill];
- name_highlight->property_fill_color_rgba() = color_map[cNameHighlightOutline];
+ name_highlight->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_NameHighlightFill.get();
+ name_highlight->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_NameHighlightOutline.get();
name_highlight->set_data ("timeaxisviewitem", this);
then NAME_Y_OFFSET to position the text in the vertical center of the highlight
*/
name_text->property_y() = (double) trackview.height - 1.0 - TimeAxisViewItem::NAME_Y_OFFSET;
- name_text->property_font_desc() = NAME_FONT;
+ name_text->property_font_desc() = *NAME_FONT;
name_text->property_anchor() = Gtk::ANCHOR_NW;
name_text->set_data ("timeaxisviewitem", this);
frame_handle_start->property_x2() = (double) TimeAxisViewItem::GRAB_HANDLE_LENGTH;
frame_handle_start->property_y1() = (double) 1.0;
frame_handle_start->property_y2() = (double) TimeAxisViewItem::GRAB_HANDLE_LENGTH+1;
- frame_handle_start->property_outline_color_rgba() = color_map[cFrameHandleStartOutline];
- frame_handle_start->property_fill_color_rgba() = color_map[cFrameHandleStartFill];
+ frame_handle_start->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_FrameHandle.get();
+ frame_handle_start->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_FrameHandle.get();
frame_handle_end = new ArdourCanvas::SimpleRect (*group);
frame_handle_end->property_x1() = (double) (trackview.editor.frame_to_pixel(get_duration())) - (TimeAxisViewItem::GRAB_HANDLE_LENGTH);
frame_handle_end->property_x2() = (double) trackview.editor.frame_to_pixel(get_duration());
frame_handle_end->property_y1() = (double) 1;
frame_handle_end->property_y2() = (double) TimeAxisViewItem::GRAB_HANDLE_LENGTH + 1;
- frame_handle_end->property_outline_color_rgba() = color_map[cFrameHandleEndOutline];
- frame_handle_end->property_fill_color_rgba() = color_map[cFrameHandleEndFill];
+ frame_handle_end->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_FrameHandle.get();
+ frame_handle_end->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_FrameHandle.get();
} else {
frame_handle_start = 0;
if (new_name != item_name) {
std::string temp_name = item_name ;
item_name = new_name ;
- name_text_width = ::pixel_width (new_name, NAME_FONT);
+ name_text_width = ::pixel_width (new_name, *NAME_FONT);
NameChanged (item_name, temp_name, src) ; /* EMIT_SIGNAL */
}
}
{
if (name_text) {
name_text->property_text() = new_name;
- name_text_width = pixel_width (new_name, NAME_FONT);
+ name_text_width = pixel_width (new_name, *NAME_FONT);
name_text_size_cache.clear ();
}
}
r = base_color.get_red()/256 ;
g = base_color.get_green()/256 ;
b = base_color.get_blue()/256 ;
- fill_color = RGBA_TO_UINT(r,g,b,255) ;
+ fill_color = RGBA_TO_UINT(r,g,b,160) ;
/* for minor colors:
if the overall saturation is strong, make the minor colors light.
uint32_t r,g,b,a;
if (_selected && should_show_selection) {
- UINT_TO_RGBA(color_map[cSelectedFrameBase], &r, &g, &b, &a);
- frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, fill_opacity);
+ UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get(), &r, &g, &b, &a);
+ frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, a);
} else {
- UINT_TO_RGBA(color_map[cFrameBase], &r, &g, &b, &a);
- frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, fill_opacity);
+ UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_FrameBase.get(), &r, &g, &b, &a);
+ frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, a);
}
}
}
{
if (frame_handle_start) {
if (position_locked) {
- frame_handle_start->property_fill_color_rgba() = color_map[cTrimHandleLockedStart];
- frame_handle_end->property_fill_color_rgba() = color_map[cTrimHandleLockedEnd];
+ frame_handle_start->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TrimHandleLocked.get();
+ frame_handle_end->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TrimHandleLocked.get();
} else {
- frame_handle_start->property_fill_color_rgba() = color_map[cTrimHandleStart];
- frame_handle_end->property_fill_color_rgba() = color_map[cTrimHandleEnd];
+ frame_handle_start->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TrimHandle.get();
+ frame_handle_end->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TrimHandle.get();
}
}
}