smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 23:35:03 +01:00
Code Issues Projects Releases Wiki Activity

NO-OP: clang-format

Browse source
This commit is contained in:
Robin Gareus 2022-01-11 13:52:02 +01:00
parent 8b90ea39a2
commit 192d513cba
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 113 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

40
gtk2_ardour/triggerbox_ui.cc
View file

@ -18,11 +18,11 @@
#include <vector> #include <vector>
#include "gtkmm/sizegroup.h"
#include <gtkmm/filechooserdialog.h> #include <gtkmm/filechooserdialog.h>
#include <gtkmm/menu.h> #include <gtkmm/menu.h>
#include <gtkmm/menuitem.h> #include <gtkmm/menuitem.h>
#include <gtkmm/stock.h> #include <gtkmm/stock.h>
#include "gtkmm/sizegroup.h"
#include "pbd/compose.h" #include "pbd/compose.h"
#include "pbd/convert.h" #include "pbd/convert.h"
@ -51,10 +51,10 @@
#include "public_editor.h" #include "public_editor.h"
#include "region_view.h" #include "region_view.h"
#include "selection.h" #include "selection.h"
#include "slot_properties_box.h"
#include "timers.h" #include "timers.h"
#include "trigger_ui.h" #include "trigger_ui.h"
#include "triggerbox_ui.h" #include "triggerbox_ui.h"
#include "slot_properties_box.h"
#include "ui_config.h" #include "ui_config.h"
#include "utils.h" #include "utils.h"
@ -182,7 +182,7 @@ TriggerEntry::draw_follow_icon (Cairo::RefPtr<Cairo::Context> context, Trigger::
uint32_t bg_color = fill_color (); uint32_t bg_color = fill_color ();
uint32_t fg_color = UIConfiguration::instance ().color ("neutral:midground"); uint32_t fg_color = UIConfiguration::instance ().color ("neutral:midground");
//in the case where there is a random follow-action, just put a "?" /* in the case where there is a random follow-action, just put a "?" */
if (trigger ()->follow_action_probability () > 0) { if (trigger ()->follow_action_probability () > 0) {
Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (context); Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (context);
layout->set_font_description (UIConfiguration::instance ().get_SmallMonospaceFont ()); layout->set_font_description (UIConfiguration::instance ().get_SmallMonospaceFont ());
@ -300,7 +300,6 @@ TriggerEntry::draw_follow_icon (Cairo::RefPtr<Cairo::Context> context, Trigger::
} }
} }
void void
TriggerEntry::draw_launch_icon (Cairo::RefPtr<Cairo::Context> context, float sz, float scale) const TriggerEntry::draw_launch_icon (Cairo::RefPtr<Cairo::Context> context, float sz, float scale) const
{ {
@ -312,7 +311,7 @@ TriggerEntry::draw_launch_icon (Cairo::RefPtr<Cairo::Context> context, float sz,
bool active = trigger ()->active (); bool active = trigger ()->active ();
if (active && trigger ()->launch_style () == Trigger::Toggle) { if (active && trigger ()->launch_style () == Trigger::Toggle) {
//clicking again will Stop this clip /* clicking again will Stop this clip */
set_source_rgba (context, UIConfiguration::instance ().color ("neutral:foreground")); set_source_rgba (context, UIConfiguration::instance ().color ("neutral:foreground"));
context->move_to (margin, margin); context->move_to (margin, margin);
context->rel_line_to (size, 0); context->rel_line_to (size, 0);
@ -320,11 +319,11 @@ TriggerEntry::draw_launch_icon (Cairo::RefPtr<Cairo::Context> context, float sz,
context->rel_line_to (-size, 0); context->rel_line_to (-size, 0);
context->rel_line_to (0, -size); context->rel_line_to (0, -size);
context->fill (); context->fill ();
return; //done return;
} }
if (!trigger ()->region ()) { if (!trigger ()->region ()) {
//no content in this slot, it is only a Stop button /* no content in this slot, it is only a Stop button */
context->move_to (margin, margin); context->move_to (margin, margin);
context->rel_line_to (size, 0); context->rel_line_to (size, 0);
context->rel_line_to (0, size); context->rel_line_to (0, size);
@ -332,7 +331,7 @@ TriggerEntry::draw_launch_icon (Cairo::RefPtr<Cairo::Context> context, float sz,
context->rel_line_to (0, -size); context->rel_line_to (0, -size);
set_source_rgba (context, UIConfiguration::instance ().color ("neutral:midground")); set_source_rgba (context, UIConfiguration::instance ().color ("neutral:midground"));
context->stroke (); context->stroke ();
return; //done return;
} }
set_source_rgba (context, UIConfiguration::instance ().color ("neutral:midground")); set_source_rgba (context, UIConfiguration::instance ().color ("neutral:midground"));
@ -340,7 +339,8 @@ TriggerEntry::draw_launch_icon (Cairo::RefPtr<Cairo::Context> context, float sz,
switch (trigger ()->launch_style ()) { switch (trigger ()->launch_style ()) {
case Trigger::Toggle: case Trigger::Toggle:
if (active) { if (active) {
context->move_to (margin, margin); //special case: now it's a square Stop button /* special case: now it's a square Stop button */
context->move_to (margin, margin);
context->rel_line_to (size, 0); context->rel_line_to (size, 0);
context->rel_line_to (0, size); context->rel_line_to (0, size);
context->rel_line_to (-size, 0); context->rel_line_to (-size, 0);
@ -349,7 +349,8 @@ TriggerEntry::draw_launch_icon (Cairo::RefPtr<Cairo::Context> context, float sz,
context->fill (); context->fill ();
context->stroke (); context->stroke ();
} else { } else {
context->move_to (margin, margin); //boxy arrow /* boxy arrow */
context->move_to (margin, margin);
context->rel_line_to (0, size); context->rel_line_to (0, size);
context->rel_line_to (size * 1 / 3, 0); context->rel_line_to (size * 1 / 3, 0);
context->rel_line_to (size * 2 / 3, -size / 2); context->rel_line_to (size * 2 / 3, -size / 2);
@ -373,20 +374,21 @@ TriggerEntry::draw_launch_icon (Cairo::RefPtr<Cairo::Context> context, float sz,
context->stroke (); context->stroke ();
} }
break; break;
case Trigger::ReTrigger: //line + boxy arrow + line case Trigger::ReTrigger:
/* line + boxy arrow + line */
if (active) { if (active) {
set_source_rgba (context, UIConfiguration::instance ().color ("neutral:foreground")); set_source_rgba (context, UIConfiguration::instance ().color ("neutral:foreground"));
} else { } else {
set_source_rgba (context, UIConfiguration::instance ().color ("neutral:midground")); set_source_rgba (context, UIConfiguration::instance ().color ("neutral:midground"));
} }
//vertical line at left /* vertical line at left */
context->set_line_width (2 * scale); context->set_line_width (2 * scale);
context->move_to (margin + 1 * scale, margin); context->move_to (margin + 1 * scale, margin);
context->line_to (margin + 1 * scale, margin + size); context->line_to (margin + 1 * scale, margin + size);
context->stroke (); context->stroke ();
//small triangle /* small triangle */
context->set_line_width (1 * scale); context->set_line_width (1 * scale);
context->move_to (margin + scale * 4, margin + 2 * scale); context->move_to (margin + scale * 4, margin + 2 * scale);
context->line_to (margin + size, margin + size / 2); context->line_to (margin + size, margin + size / 2);
@ -398,7 +400,8 @@ TriggerEntry::draw_launch_icon (Cairo::RefPtr<Cairo::Context> context, float sz,
context->stroke (); context->stroke ();
} }
break; break;
case Trigger::Gate: //diamond shape case Trigger::Gate:
/* diamond shape */
context->move_to (margin + size / 2, margin); context->move_to (margin + size / 2, margin);
context->rel_line_to (size / 2, size / 2); context->rel_line_to (size / 2, size / 2);
context->rel_line_to (-size / 2, size / 2); context->rel_line_to (-size / 2, size / 2);
@ -413,7 +416,8 @@ TriggerEntry::draw_launch_icon (Cairo::RefPtr<Cairo::Context> context, float sz,
context->stroke (); context->stroke ();
} }
break; break;
case Trigger::Repeat: //'stutter' shape case Trigger::Repeat:
/* 'stutter' shape */
context->set_line_width (1 * scale); context->set_line_width (1 * scale);
context->move_to (margin, margin); context->move_to (margin, margin);
context->rel_line_to (0, size); context->rel_line_to (0, size);
@ -427,7 +431,8 @@ TriggerEntry::draw_launch_icon (Cairo::RefPtr<Cairo::Context> context, float sz,
if (active) { if (active) {
set_source_rgba (context, UIConfiguration::instance ().color ("neutral:foregroundest")); set_source_rgba (context, UIConfiguration::instance ().color ("neutral:foregroundest"));
} else { } else {
set_source_rgba (context, HSV (UIConfiguration::instance ().color ("neutral:midground")).lighter (0.25).color ()); //stutter shape needs to be brighter to maintain balance /* stutter shape needs to be brighter to maintain balance */
set_source_rgba (context, HSV (UIConfiguration::instance ().color ("neutral:midground")).lighter (0.25).color ());
} }
context->stroke (); context->stroke ();
break; break;
@ -444,7 +449,7 @@ TriggerEntry::render (ArdourCanvas::Rect const& area, Cairo::RefPtr<Cairo::Conte
Rectangle::render (area, context); Rectangle::render (area, context);
/* Note that item_to_window() already takes _position into account (as /* Note that item_to_window() already takes _position into account (as
part of item_to_canvas() * part of item_to_canvas()
*/ */
ArdourCanvas::Rect self (item_to_window (_rect)); ArdourCanvas::Rect self (item_to_window (_rect));
const ArdourCanvas::Rect draw = self.intersection (area); const ArdourCanvas::Rect draw = self.intersection (area);
@ -720,7 +725,6 @@ TriggerEntry::follow_button_event (GdkEvent* ev)
return false; return false;
} }
/* ***************************************************** */ /* ***************************************************** */
TriggerBoxUI::TriggerBoxUI (ArdourCanvas::Item* parent, TriggerBox& tb) TriggerBoxUI::TriggerBoxUI (ArdourCanvas::Item* parent, TriggerBox& tb)

1
gtk2_ardour/triggerbox_ui.h
View file

@ -74,7 +74,6 @@ public:
private: private:
bool _grabbed; bool _grabbed;
double _poly_size; double _poly_size;
double _poly_margin; double _poly_margin;