Corrected some indentation

This commit is contained in:
Joel Holdsworth 2008-06-19 21:37:36 +01:00
parent 3cc0f72389
commit f8a2291118

View file

@ -43,44 +43,44 @@ namespace timeline {
TimelineRuler::TimelineRuler() : TimelineRuler::TimelineRuler() :
Glib::ObjectBase("TimelineRuler") Glib::ObjectBase("TimelineRuler")
{ {
set_flags(Gtk::NO_WINDOW); // This widget will not have a window set_flags(Gtk::NO_WINDOW); // This widget will not have a window
set_size_request(-1, 20); set_size_request(-1, 20);
// Install style properties // Install style properties
timeScale = GAVL_TIME_SCALE / 200; timeScale = GAVL_TIME_SCALE / 200;
timeOffset = 0; timeOffset = 0;
} }
bool bool
TimelineRuler::on_expose_event(GdkEventExpose* event) TimelineRuler::on_expose_event(GdkEventExpose* event)
{ {
// This is where we draw on the window // This is where we draw on the window
Glib::RefPtr<Gdk::Window> window = get_window(); Glib::RefPtr<Gdk::Window> window = get_window();
if(!window) if(!window)
return false; return false;
// Makes sure the widget styles have been loaded // Makes sure the widget styles have been loaded
read_styles(); read_styles();
// Prepare to render via cairo // Prepare to render via cairo
Allocation allocation = get_allocation(); Allocation allocation = get_allocation();
Glib::RefPtr<Style> style = get_style(); Glib::RefPtr<Style> style = get_style();
Cairo::RefPtr<Cairo::Context> cairo = window->create_cairo_context(); Cairo::RefPtr<Cairo::Context> cairo = window->create_cairo_context();
Glib::RefPtr<Pango::Layout> pango_layout = create_pango_layout(""); Glib::RefPtr<Pango::Layout> pango_layout = create_pango_layout("");
cairo->translate(allocation.get_x(), allocation.get_y());
// Render the background cairo->translate(allocation.get_x(), allocation.get_y());
Gdk::Cairo::set_source_color(cairo, style->get_bg(STATE_NORMAL));
cairo->rectangle(0, 0, allocation.get_width(), allocation.get_height()); // Render the background
cairo->fill(); Gdk::Cairo::set_source_color(cairo, style->get_bg(STATE_NORMAL));
cairo->rectangle(0, 0, allocation.get_width(), allocation.get_height());
// Render ruler annotations cairo->fill();
gavl_time_t major_spacing = GAVL_TIME_SCALE;
// Render ruler annotations
int64_t time_offset = timeOffset; gavl_time_t major_spacing = GAVL_TIME_SCALE;
while(time_offset / timeScale < allocation.get_width())
int64_t time_offset = timeOffset;
while(time_offset / timeScale < allocation.get_width())
{ {
pango_layout->set_text(lumiera_tmpbuf_print_time(time_offset)); pango_layout->set_text(lumiera_tmpbuf_print_time(time_offset));
Pango::Rectangle text_extents = pango_layout->get_logical_extents(); Pango::Rectangle text_extents = pango_layout->get_logical_extents();
@ -96,15 +96,15 @@ TimelineRuler::on_expose_event(GdkEventExpose* event)
time_offset += major_spacing; time_offset += major_spacing;
} }
return true; return true;
} }
void void
TimelineRuler::read_styles() TimelineRuler::read_styles()
{ {
//background = WindowManager::read_style_colour_property( //background = WindowManager::read_style_colour_property(
// *this, "background", 0, 0, 0); // *this, "background", 0, 0, 0);
} }
} // namespace timeline } // namespace timeline
} // namespace widgets } // namespace widgets