Skip to content

Commit

Permalink
Updated icons to scale with scaling factor.
Browse files Browse the repository at this point in the history
  • Loading branch information
ggarra13 committed Apr 17, 2024
1 parent 4c76b09 commit ec64361
Showing 1 changed file with 22 additions and 12 deletions.
34 changes: 22 additions & 12 deletions mrv2/lib/mrvWidgets/mrViewer.fl
Original file line number Diff line number Diff line change
Expand Up @@ -1070,7 +1070,8 @@ Value is: pow( 2, 1/x );} xywh {651 26 39 25} type {Horz Knob} labelsize 10 max
Fl_Button uiScrub {
user_data this user_data_type {ViewerUI*}
callback {uiView->setActionMode( mrv::ActionMode::kScrub );}
tooltip {Scrubbing Tool} image {../../icons/Scrub.svg} compress_image 0 xywh {2 53 40 35} down_box DOWN_BOX value 1 selection_color 95
tooltip {Scrubbing Tool} xywh {2 53 40 35} down_box DOWN_BOX value 1 selection_color 95
code0 {o->image(mrv::load_svg("Scrub.svg"));}
class {mrv::Button}
}
Fl_Button uiSelection {
Expand All @@ -1081,8 +1082,9 @@ if (Fl::event_clicks() >= 1)
{
mrv::panel::color_area_panel_cb( nullptr, v);
Fl::event_clicks(0);
}} selected
tooltip {Area Select Tool} image {../../icons/Selection.svg} compress_image 0 xywh {2 88 40 35} down_box DOWN_BOX selection_color 95
}}
tooltip {Area Select Tool} xywh {2 88 40 35} down_box DOWN_BOX selection_color 95
code0 {o->image(mrv::load_svg("Selection.svg"));}
class {mrv::Button}
}
Fl_Button uiDraw {
Expand All @@ -1094,7 +1096,8 @@ if (Fl::event_clicks() >= 1)
mrv::panel::annotations_panel_cb( nullptr, v);
Fl::event_clicks(0);
}}
tooltip {Freehand Drawing Tool} image {../../icons/Draw.svg} compress_image 0 xywh {2 123 40 35} down_box DOWN_BOX selection_color 95
tooltip {Freehand Drawing Tool} xywh {2 123 40 35} down_box DOWN_BOX selection_color 95
code0 {o->image(mrv::load_svg("Draw.svg"));}
class {mrv::Button}
}
Fl_Button uiErase {
Expand All @@ -1105,8 +1108,9 @@ if (Fl::event_clicks() >= 1)
{
mrv::panel::annotations_panel_cb( nullptr, v);
Fl::event_clicks(0);
}}
tooltip {Eraser Tool} image {../../icons/Erase.svg} compress_image 0 xywh {2 158 40 35} down_box DOWN_BOX selection_color 95
}} selected
tooltip {Eraser Tool} xywh {2 158 40 35} down_box DOWN_BOX selection_color 95
code0 {o->image(mrv::load_svg("Erase.svg"));}
class {mrv::Button}
}
Fl_Button uiCircle {
Expand All @@ -1118,7 +1122,8 @@ if (Fl::event_clicks() >= 1)
mrv::panel::annotations_panel_cb( nullptr, v);
Fl::event_clicks(0);
}}
tooltip {Circle Tool} image {../../icons/Circle.svg} compress_image 0 xywh {2 193 40 35} down_box DOWN_BOX selection_color 95
tooltip {Circle Tool} xywh {2 193 40 35} down_box DOWN_BOX selection_color 95
code0 {o->image(mrv::load_svg("Circle.svg"));}
class {mrv::Button}
}
Fl_Button uiRectangle {
Expand All @@ -1130,7 +1135,8 @@ if (Fl::event_clicks() >= 1)
mrv::panel::annotations_panel_cb( nullptr, v);
Fl::event_clicks(0);
}}
tooltip {Rectangle Tool} image {../../icons/Rectangle.svg} compress_image 0 xywh {2 228 40 35} down_box DOWN_BOX selection_color 95
tooltip {Rectangle Tool} xywh {2 228 40 35} down_box DOWN_BOX selection_color 95
code0 {o->image(mrv::load_svg("Rectangle.svg"));}
class {mrv::Button}
}
Fl_Button uiArrow {
Expand All @@ -1142,7 +1148,8 @@ if (Fl::event_clicks() >= 1)
mrv::panel::annotations_panel_cb( nullptr, v);
Fl::event_clicks(0);
}}
tooltip {Arrow Tool} image {../../icons/Arrow.svg} compress_image 0 xywh {2 263 40 35} down_box DOWN_BOX selection_color 95
tooltip {Arrow Tool} xywh {2 263 40 35} down_box DOWN_BOX selection_color 95
code0 {o->image(mrv::load_svg("Arrow.svg"));}
class {mrv::Button}
}
Fl_Button uiText {
Expand All @@ -1161,7 +1168,8 @@ if (Fl::event_clicks() >= 1)
mrv::panel::annotations_panel_cb( nullptr, v);
Fl::event_clicks(0);
}}
tooltip {Text Tool. Right click to edit previously stamped text.} image {../../icons/Text.svg} compress_image 1 xywh {1 298 40 35} down_box DOWN_BOX selection_color 95 labelfont 8 labelsize 24 labelcolor 7
tooltip {Text Tool. Right click to edit previously stamped text.} xywh {1 298 40 35} down_box DOWN_BOX selection_color 95 labelfont 8 labelsize 24 labelcolor 7
code0 {o->image(mrv::load_svg("Text.svg"));}
class {mrv::Button}
}
Fl_Button uiPenColor {
Expand Down Expand Up @@ -1191,13 +1199,15 @@ settings->setValue( mrv::kPenColorA, a);}
Fl_Button uiUndoDraw {
user_data this user_data_type {ViewerUI*}
callback {uiView->undo();}
tooltip {Undo Last Shape Drawn in Current Frame.} image {../../icons/Undo.svg} compress_image 0 xywh {0 396 40 35} deactivate
tooltip {Undo Last Shape Drawn in Current Frame.} xywh {0 396 40 35} deactivate
code0 {o->image(mrv::load_svg("Undo.svg"));}
class {mrv::Button}
}
Fl_Button uiRedoDraw {
user_data this user_data_type {ViewerUI*}
callback {uiView->redo();}
tooltip {Redo Previous Shape Drawn in Current Frame.} image {../../icons/Redo.svg} compress_image 0 xywh {0 431 40 36} deactivate
tooltip {Redo Previous Shape Drawn in Current Frame.} xywh {0 431 40 36} deactivate
code0 {o->image(mrv::load_svg("Redo.svg"));}
class {mrv::Button}
}
}
Expand Down

0 comments on commit ec64361

Please sign in to comment.