13
0
Commit Graph

7331 Commits

Author SHA1 Message Date
86eb72955c use a gloabl size group for track-header ctrl buttons 2014-09-04 23:21:05 +02:00
50753b77f4 transport option buttons should expand to fill space. 2014-09-04 23:16:48 +02:00
4030fe2b66 and some more button px tweaks 2014-09-04 23:16:18 +02:00
2651bc7e10 NOOP, fix indent 2014-09-04 21:12:50 +02:00
4dbfbb6edb fix c4be8c2a67 2014-09-04 21:03:07 +02:00
7b3914c730 "Aux" is a small button now, 2nd line is not visible 2014-09-04 20:11:45 +02:00
86ffa35f84 separate button text-height -> button-height factor, bump to 1.3[em] 2014-09-04 20:11:45 +02:00
dc02625b56 further tweaks pertaining the track-number height 2014-09-04 20:11:44 +02:00
c4be8c2a67 when track selection changes, cancel any and all name editing 2014-09-04 13:57:05 -04:00
d717a0680a properly centered text..
..at the risk of blurring some text with
some fonts when the text is shifted by 0.5px.
2014-09-04 18:12:46 +02:00
795451a697 Trick 17: share separator + border:
This effectively adds a line after the last track.
2014-09-04 18:08:45 +02:00
cb05e3a21d dedicated TAV separator line 2014-09-04 17:01:28 +02:00
70358639de Revert "cont'd work on automation-track headers (amend ba53af1c5)"
This reverts commit beb5e3e777.
2014-09-04 16:14:01 +02:00
dc4ee8196f fix LED active area 2014-09-04 15:06:42 +02:00
1f20be1571 make generic buttons less prominent 2014-09-04 15:05:37 +02:00
dea4b27ca6 update number label geometry
the number label can be significantly wider than other
ctrl buttons and does not lend itself or be 'square'.
2014-09-04 03:09:38 +02:00
98404c6e62 ardour button sizes, now [em] based. 2014-09-04 02:24:37 +02:00
0d4460b736 merge fix 2014-09-03 15:26:33 -05:00
69ac29d375 consolidate some slider styles, and make bg darker 2014-09-03 15:26:33 -05:00
66f60970dd use the new RecButton element for the master rec arm (?) 2014-09-03 15:26:33 -05:00
a9d19c9720 actively recording track-arm button is red, not pink 2014-09-03 15:26:33 -05:00
11a376031f amend a99bd289 (button x-axis padding) 2014-09-03 22:17:25 +02:00
a25f6af94a use close/cross button 2014-09-03 22:07:46 +02:00
a99bd28950 add "close/cross" special button 2014-09-03 22:07:25 +02:00
a2a399d6f9 tweak button size request 2014-09-03 22:06:45 +02:00
ba3eb177c7 clean up rec-en circle math and limit the max radius of it 2014-09-03 22:05:53 +02:00
73cfd26237 proper automation header indenting 2014-09-03 20:48:20 +02:00
beb5e3e777 cont'd work on automation-track headers (amend ba53af1c5)
now that the separator line is at the top,
offset region-contents y0 by 1px.
2014-09-03 20:48:20 +02:00
0ea1238479 ask TAV buttons to have square proportions 2014-09-03 11:56:31 -05:00
6dd114c3f1 fix Play Loop from range context menu 2014-09-03 09:40:22 -05:00
4e85bda431 selecting a track in the mixer, with synced selection, will now clear any objects selected 2014-09-03 09:40:22 -05:00
e9ff578f3a amend prev commit (Ardour button radii) 2014-09-03 15:26:54 +02:00
b0660b3e7d Update Ardour Button radii.
This is effectively a noop. Decrease default radius,
only add to radius (for outline), never subtract to avioid
negative numbers.
2014-09-03 15:21:19 +02:00
ba53af1c50 quick mockup of indented automation-track headers
XXX: If we keep this approach, TimeAxisView::show_at()
needs to be fixed.
TimeAxisView::_canvas_display should draw the separator
line at the top, and regions inside moved down 1px.
2014-09-03 15:03:35 +02:00
3814c65680 robin needs a new keyboard with unstttttuck tt. 2014-09-03 05:20:33 +02:00
09cec26610 fix some compiler warnings 2014-09-03 02:40:06 +02:00
c4212fb10b use tape-track rec-enable icon throughout. 2014-09-03 02:40:01 +02:00
599af96971 use new tape rec-en 2014-09-03 02:39:55 +02:00
d7ff2b87fb update rec-en circle drawing, add tape-mode 2014-09-03 01:55:57 +02:00
930e6eecf8 stroke black circle on top of rec circle 2014-09-02 15:57:08 -05:00
bc16da5b5a micro tweaks to ArdourButton corners 2014-09-02 15:16:37 -05:00
5d5d859c2a use new 'special' rec-en button 2014-09-02 20:43:27 +02:00
1592d04828 one off, special case rec-en button for now. (circle may need tweaking)
In the long run we want a class hierarchy:
CairoWidget
-> ArdourWidget
-> ArdourLabel
-> ArdourButton
-> SpecialArdourButton(s)
2014-09-02 20:43:15 +02:00
9cd0af6b51 compact meter+fader for > 6 channel tracks 2014-09-02 19:33:58 +02:00
5d0e4f7380 number-label: use pixel-width for given font 2014-09-02 19:27:40 +02:00
29b7cb4a05 ArdourButton: prepare for [em] based padding 2014-09-02 19:23:18 +02:00
b184df3286 static global definition for track-header width
the track-header minimum width is defined by
the name-label (IFF the 2nd row fader is not visible,
but the fader is rather small by default and and grows)

track-header width in almost all cases is:
   name-label width
 + width of three button (1 char each)
 + max size of all meters (if visible)
 + width of MIDI scroomer (if visible)
 + 2px table cellspacing (per column)
2014-09-02 18:12:39 +02:00
eed9542930 get rid of a compiler warning 2014-09-02 16:17:42 +02:00
6462cfa843 dramatically speed up track-number show/hide toggle 2014-09-02 16:17:20 +02:00
538a569d0b add a special bool option that prevents redrawing 2014-09-02 16:16:36 +02:00
88df9c28a6 fix static initialization of Gtk::SizeGroup 2014-09-02 05:14:26 +02:00
5803f26c51 add style for BarController SpinButton 2014-09-02 05:14:22 +02:00
540a12119b prepare Slider API cleanup 2014-09-02 02:53:05 +02:00
001e4ca684 Engine Dialog: focus OK button (press enter to cont w/previous settings) 2014-09-01 22:06:45 +02:00
b012f2cd18 retain track-header width regardless of number-label. 2014-09-01 00:00:20 +02:00
b469cd217f Bring back control slider on MIDI controller "tracks". 2014-08-31 17:54:16 -04:00
885f1c71ec Remove unused variables (fix warnings). 2014-08-31 17:54:16 -04:00
dbad29f388 the story of 0 2014-08-31 23:38:25 +02:00
cb8ce29725 rework track inset (amend 7d7b787 and bf13bf63):
Only inset red-selection rectangle (top & bottom).
Do not draw duplicate borders (waste pixels) for regular regions.
2014-08-31 23:36:38 +02:00
4718def3c4 update track-header width when removing track(s). 2014-08-31 22:54:43 +02:00
7d7b787a28 inset regions into track (don't share edges) 2014-08-31 22:24:44 +02:00
423f6e3445 fix track-header hide/show 2014-08-31 22:24:26 +02:00
154621978a track-header fader tweaks:
* align height to button-height.
* align width to label text-entry
* increase min width
2014-08-31 21:32:22 +02:00
0b1ee476ed proper 1px track separator 2014-08-31 20:08:38 +02:00
f7e5d4eba2 the return of the time_axis_vbox 2014-08-31 19:43:32 +02:00
e3d982a66e set initial TAV style 2014-08-31 18:51:04 +02:00
1e0c987b77 update track-header width when changing show-track-meters 2014-08-31 16:46:11 +02:00
888f440633 move midi scroomer to right of meter and fix alignment 2014-08-31 16:15:52 +02:00
098a698052 right side track-header control buttons (for non mixbus profile) 2014-08-31 16:12:43 +02:00
db34d9a556 proper round corners on focused TextEntry
IFF [xy]thickness is set > 2 for given Entry.

It seems gtk draws a base-color rectangle on
top, after clearlooks_draw_entry() is called.
This fills the complete area and voids previous
rounded rectangles in clearlooks_draw_entry().
setting [xy]thickness decreases the size of the
base rectangle.
2014-08-31 12:46:45 +02:00
42e6c9c75d proper round corners for peak&gain display 2014-08-31 12:08:39 +02:00
f6da7c67ab experiment with track-selection box shadow 2014-08-31 08:08:36 +02:00
059e438f40 fix [potential] double clock connection:
ARDOUR_UI::set_session() starts clocking for a given session.
make sure ARDOUR_UI::parameter_changed() does not connect
before the session is active.
2014-08-31 07:54:59 +02:00
026c71331e distinguish global peak-reset button from meters:
With > 2 channels, the editor toolbar meters are
otherwise very similar to the reset-button.
2014-08-31 07:43:21 +02:00
d0c7984320 new min. height for midi controls 2014-08-31 07:12:41 +02:00
c993e2d37b update track-header width when track-number visibility is toggled 2014-08-31 07:12:21 +02:00
19b212334a remove (unused) separator, update TAV height calc. 2014-08-31 07:12:00 +02:00
9c59b21bb6 simplify time-axis packing: consistent table layout 2014-08-31 07:11:24 +02:00
36c4704df9 revert parts of bf13bf63, change track-header color on selection 2014-08-30 21:44:47 +02:00
dc83ae4ffc NOOP, re-indent, fix whitespace 2014-08-30 21:44:41 +02:00
dfbc9da79a update clocks and video-frames at FPS 2014-08-30 20:57:27 +02:00
16443f44a2 add an idle callback at FPS 2014-08-30 20:57:22 +02:00
01864b43e0 redraw clock(s) only when needed. 2014-08-30 20:17:34 +02:00
125fe6e3bc video-pullup and timecode-format are session options 2014-08-30 20:11:07 +02:00
936cb05989 update dropdown triangle 2014-08-30 18:26:03 +02:00
8e3b1c17c1 fader+meter: update numeric display bg on style change 2014-08-30 04:19:48 +02:00
f5533213c0 fix some compiler warnings 2014-08-30 02:26:36 +02:00
926d4eb36e remove cruft 2014-08-30 01:43:10 +02:00
4efa0fd77c ArdourButton align text to full pixels 2014-08-30 01:43:10 +02:00
bf13bf6385 red-border selection for tracks, regions, and processors. requesting comments 2014-08-29 17:16:32 -05:00
65e1760446 Ardour button, proper cairo fill+stroke px alignments
rounded rectangles are cairo_arc() path,
for line strokes, offset by .5.

This patch also includes two small related style tweaks:
* Gtkmm2ext::Selected line color & thickness
* 'grabbed' line color & thickness
2014-08-29 23:02:35 +02:00
65287a6f09 mark "Label Buttons" as inactive 2014-08-29 21:10:20 +02:00
78b9f65632 explicit Button inactive state.
Ideally large parts of ArdourButton would become ArdourLabel,
which in turn is used by ArdourButton
2014-08-29 21:08:49 +02:00
083620beb8 ArdourButton: suppress visible response if no action is defined.
This fixes issues where the button is used as Label
(currently track-numbers and meterbridge track-name)
2014-08-29 20:20:37 +02:00
d6454dfb36 amend 7be3c88a, update rec-en color 2014-08-29 19:55:25 +02:00
7be3c88a3e experiment with unicode circle for rec-en
fixes button-area width mismatch on track-headers
except for tape-tracks (which till use old fixed size icon)
2014-08-29 01:13:49 +02:00
392f4847b0 use 2 digit width as minium for track number labels 2014-08-28 22:38:59 +02:00
99051c3af4 processor toggle controls should be blue when activated 2014-08-28 15:33:58 -05:00
39e2223fee yet another ArdourButton action tweak 2014-08-28 15:29:18 -05:00
b0477f7f1e fix plugin bypass button action 2014-08-28 15:29:18 -05:00
e6ab754e4f video-timeline tools path updates for OSX and Windows 2014-08-28 21:39:59 +02:00
a4bda23bba remove offset from icons when button is pushed 2014-08-28 14:29:49 -05:00
7306568634 More fixes to ArdourButton actions.
Optionally allow events to fallthrough to parents, in particular for the DnDVBox case.
Also allow the number_label to operate as a track selector.
2014-08-28 14:25:19 -05:00
61c11157c0 add option to blink rec-enables 2014-08-28 13:00:59 -05:00
3f297f7dab Fix ArdourButton event sequence.
Always give ArdourButton a chance to handle Press or Release events if you override them.
This allows ArdourButtons to do the "Pressed" animation
And it now correctly eats the event so button clicks don't select the channelstrip.
2014-08-28 10:31:57 -05:00
3cc19c2cce brighten post-fader redirects, and change redirect leds to blue 2014-08-28 08:58:26 -05:00
9bb7cec013 replace missing fader redirect color 2014-08-28 08:19:57 -05:00
390c480639 move preferences->GUI->Metering into its own tab 2014-08-27 14:02:00 -05:00
d439e93b1e Standardize drawing of PixFader and BarController; implement flat_buttons and prelight.
Prepare for using Controllable interfaces, instead of passing in Adjustments.
ToDo:  reimplement image caching in a standardized way across widgets
2014-08-27 11:58:09 -05:00
fad9068981 even more flat_buttons 2014-08-27 11:56:06 -05:00
71f471f162 more flat_button refactoring. try centering the gain and peak displays 2014-08-27 11:55:32 -05:00
a52e18c7e8 use ArdourButtons on the automation time axis 2014-08-27 11:53:53 -05:00
b4386a6e00 more flat_button refactoring 2014-08-27 11:53:30 -05:00
e7a15027e8 refactor flat_buttons into cairowidget, and add a canvas-like convenience function for setting cairo color with a Gtk::Color 2014-08-27 10:55:01 -05:00
5db98d9372 fix pushed-in state of invert buttons, and fix an initizlization order warning 2014-08-27 10:49:36 -05:00
74f313dd6b Rationalize ArdourButton and lots of associated theming issues.
ArdourButtons now have a "pushed" animation.
The gradient is now implemented in the button, rather than providing 2 colors in the theme, which was burdensome.
Lots of code cleanup in ArdourButton.  Removed several unnecessary flags.
Refactor more stuff into route_ui.
2014-08-22 11:51:20 -05:00
a7226133a9 refactor _grabbed into cairo_widget 2014-08-22 11:49:59 -05:00
c29417f48e Merge branch 'selection_fixes' of https://github.com/nmains/ardour into cairocanvas 2014-08-14 17:48:11 +02:00
nick_m
7e022b6445 Fix crash on snapshot change. 2014-08-15 01:42:48 +10:00
90397c3ac9 remove cruft related to button-height commit 2014-08-13 11:00:04 -05:00
f3d524deb7 Yet another attempt to standardize button heights.
Use the same string for all ArdourButtons to define the height.
Height can still vary if you use a different font, though.
2014-08-13 10:57:04 -05:00
aed4ab6ec9 Clicking already-selected region should clear other selections. Thanks to nick_m 2014-08-12 14:40:43 -05:00
5c1a561325 change packing so number_label shares space with name_label 2014-08-11 15:08:57 -05:00
b41df8e120 shuffle packing order to accomodate midi controls 2014-08-11 14:44:12 -05:00
bf034f48ce New track header layout.
Vertical alignment no longer depends on number of meters shown.
Looking for comments.
2014-08-11 12:59:42 -05:00
ce4333f059 Use explicit strip widths and button heights for the mixer
The goal is to preserve a consistent layout and sizing of the buttons.
Button height should not resize based on text, because font styles differ and this leads to inconsistent button heights
Button width should not be based on text or font size;  instead, font size just determines how many chars will be visible in the button
There are some elements of the editor page which _do_ scale based on the text width, and thats probably sensible because the text is predefined, and needs to fit
2014-08-06 15:47:22 -05:00
1873bcfa9d More fixes for range-based automation editing.
-Remove redundant start_grab calls.
-Show gain curves in Range mode, so you can see the curves you are selecting
2014-08-06 14:43:40 -05:00
16ca4e0f9a Initial steps towards usable range-based automation editing.
TODO:  needs undo. only works in top quarter of automation lane.  selection model feels weird sometimes.  needs to show gain curve when you are using Range tool
2014-08-05 15:42:06 -05:00
f296389fe0 Enforce mixer strip widths, more case fixes, and minor theme changes 2014-08-01 15:44:42 -05:00
b128271f29 consistently use mixed-case labels 2014-08-01 14:31:18 -05:00
3687dae6f6 top button table causes spacing issues when items are hidden. removed it. 2014-08-01 14:09:51 -05:00
3961017921 allow track headers to select io from right-click menu 2014-08-01 13:48:47 -05:00
7cd7927f0a fix gain entry cancellation, per the_CLA 2014-08-01 13:48:47 -05:00
f71c060295 micro tweaks to width box and name button layout 2014-07-31 15:37:38 -05:00
b7c4a25560 Increase mixer strip button vpad to 4.
Fix issue where soloing resized buttons.
2014-07-31 15:56:34 -04:00
c5856428d8 Add 1px border to mixer strip so buttons don't overlap selection border. 2014-07-30 18:51:45 -04:00
b75b88a1eb Use text to specify combo box padding for better font/display tolerance.
Consistent mixer strip button height.

The latter works by setting all the button size request heights to the
calculated height of the alphabet.  Thus, all buttons of the same class will be
the same height regardless of their actual text.
2014-07-30 18:30:42 -04:00
394ea9cb86 use FocusEntry for the peak_display, so it matches the size of gain_display 2014-07-30 12:30:33 -05:00
f91846d5f8 More colour tweaks according to IRC discussion. 2014-07-30 13:10:35 -04:00
c1616ccff6 Shrink minimum width a bit by using the same hpad for all toolbar selectors.
30 was already being used for some, and looks like more than enough padding,
for me.  Hopefully is enough everywhere.
2014-07-29 23:44:57 -04:00
564d8d7669 Consistent styling for toolbar buttons.
All the different looks here didn't seem to convey anything useful to me, and
looked sloppy.  I went with the style of the transport button.

It would be nice if we could style button elements like Inset in the
configuration, but this would require some work.
2014-07-29 23:39:01 -04:00
b32823f074 Various UI tweaks.
Refactor comments dialog into Route_UI so it can be shared by tracks and strips.
Make Color and Comments selections consistent in the menus
Refine the color displays at the top of each mixer strip
Correctly color the number displays on tracks
2014-07-29 16:40:19 -05:00
79b34f0d8f In the mixbus mixer, the rec/mon buttons are smaller
If Input is not shown, then you are just mixing, so the_CLA and I think it is ok to hide the MIDI input button with the audio input button
2014-07-29 11:48:35 -05:00
4af99f7d00 remove some cruft with group button, move it under fader 2014-07-28 16:16:51 -05:00
ed07c53210 clean up cruft in some config variables 2014-07-28 15:55:20 -05:00
fb77669ee5 force horizontal scrollbar and spacer, so strips line up nicely 2014-07-28 12:01:54 -05:00
10747bc980 Mixer page: ESC should deselect all mixer strips and processors 2014-07-28 11:35:41 -05:00
02af7cb418 alternate layout with a full-height editor-mixer, for mixbus 2014-07-28 11:27:02 -05:00
df2a8fccc7 disallow selection of the fader and meter processor entries 2014-07-28 10:08:26 -05:00
cd96ae8e8a fix for video-monitor (xjadeo >= 0.7.8 is started w/o jack-transport) 2014-07-25 12:59:41 +02:00