Commit graph

232 commits

Author SHA1 Message Date
nikolay
12e24a785f [Summary] Allow to set 250 symbols name for track. Show only first 15 symbols of the track's name in Track Header
[Reviewed] GZharun
2014-09-24 15:01:19 +03:00
GZharun
42854b695e [Summary] Fixed name edit reaction to esc button.
[Details] Name should be reset back when edit is finished on esc. The issue was that name entry context was not reset back and still applied on focus changed even if esc key was pressed.
2014-09-22 18:01:52 +03:00
GZharun
882fdc793c [Summary] Changed tracks selection workflow according to PRD 2014-09-09 14:04:13 +03:00
Paul Davis
240f93a2c3 when track selection changes, cancel any and all name editing 2014-09-04 13:56:29 -04:00
nikolay
87afeb76ad [Summary] Limit track name to 13 letters
[Reviewed] GZharun
2014-09-04 17:34:55 +03:00
Paul Davis
31d500e3a9 Merge branch 'master' into ardour-merge
Conflicts:
	gtk2_ardour/ardour_ui.cc
	gtk2_ardour/ardour_ui2.cc
	gtk2_ardour/editor.cc
	gtk2_ardour/mixer_strip.cc
	gtk2_ardour/route_time_axis.cc
	gtk2_ardour/route_ui.h
	gtk2_ardour/ui/audio_time_axis.xml
	gtk2_ardour/ui/editor_mixer.xml
	gtk2_ardour/ui/meter_strip.xml
	gtk2_ardour/waves_button.cc
	gtk2_ardour/waves_button.h
	gtk2_ardour/waves_zoom_control.cc
	gtk2_ardour/waves_zoom_control.h
2014-08-27 12:38:27 -04:00
Greg Zharun
bb5c74fa62 [Summary] Resolved DnD and track selection conflict on mouse button one release, refactored some tracks selection usecases according to PRD 2014-08-22 14:51:04 +03:00
GZharun
4d9d7b933e [Summary] Resolved conflicts of track header DnD with other operations 2014-08-21 17:41:34 +03:00
nikolay
c30b45606f [Summary] Increase NormalHeight of the TrackHeader
[Reviewed] GZharun
2014-08-20 14:06:13 +03:00
GZharun
4d83cff036 [Summary] Made master track number hidden correctly
[Details] Previous implementation was unsafe in terms of C++
2014-08-18 18:43:43 -04:00
GZharun
3fbee2bd6e [Summary] Made master track number hidden correctly
[Details] Previous implementation was unsafe in terms of C++
2014-08-18 16:15:31 -04:00
Paul Davis
90502b200d scroll up/down by tracks uses top edge as "focal point"; fix some other nasty code details 2014-08-18 12:23:52 -04:00
Paul Davis
1983bae513 fix edges of selection rects in time axis views to lie correctly within bounds of the time axis view 2014-08-17 19:46:24 -04:00
Robin Gareus
a17616f1da move utility functions into a dedicated namespace
Conflicts:
	gtk2_ardour/about.cc
	gtk2_ardour/editor_ops.cc
2014-08-17 18:51:22 -04:00
Paul Davis
28fdc71d70 more canvas refactoring.
Remove Canvas::Layout, use Canvas::Container for the same purpose, move child-rendering into Item::render_children() so that it
could theoretically be used by any derived type.
2014-08-17 17:44:17 -04:00
Paul Davis
3be5f658ea use newly factored canvas in gtk2_ardour 2014-08-17 17:43:03 -04:00
Paul Davis
499cec2acb fix naming of selection rect-related items 2014-08-17 16:24:28 -04:00
Paul Davis
d9cee7a6d6 fix scrolling behaviour in track headers (event was stolen by rulers because event coordinates made it look as if the event happened there) 2014-08-17 15:24:46 -04:00
Paul Davis
27b2651b28 restored track height adjustment using alt-scroll on track headers 2014-08-17 15:09:28 -04:00
Paul Davis
91702c2702 forward scroll events from track control headers to the canvas, to get consistent scroll behaviour (whatever that behaviour is)
Conflicts:
	gtk2_ardour/editor.cc
2014-08-17 15:00:07 -04:00
Paul Davis
e8e3460665 more profound changes to canvas scrolling, in particular find appropriate ScrollGroup for Canvas::{window,canvas}_to_{canvas,window}()
Conflicts:
	gtk2_ardour/editor_mouse.cc
2014-08-17 13:43:52 -04:00
GZharun
d2135c25a8 [SUMMARY] Changed track numbering and hided number for master track 2014-08-13 13:49:08 +03:00
VKamyshniy
a548c332c1 [Summary] Bug fixing 2014-07-29 18:24:58 +03:00
VKamyshniy
cccb8d676b [Summary] Fixing the display of number of tracks 2014-07-29 13:01:05 +03:00
nikolay
151c3afcff [Summary] Prevent track resizing more then 22*40 pix
[Review] Nobody
2014-07-23 16:31:55 +03:00
nikolay
8845a9c361 [Summary] Changed TrackHeader context menu
[Review] Nobody
2014-07-23 12:46:02 +03:00
VKamyshniy
596e3b9140 [Summary] Progressing MASTER UI and occasional cleanup 2014-07-16 00:12:14 +03:00
VKamyshniy
6e3cdd4023 [Summary[Summary] Implementing TRACK Header UI 2014-07-07 15:16:34 +03:00
VKamyshniy
3833e3b627 Merge branch 'master' of git.waves.com:waves/tracks 2014-07-04 18:04:39 +03:00
Grygorii Zharun
ce2a519afa [Summary] Merging from GIT
[Details] Starting point:
Mar 24 2014, 11:47 PM
Commit: 87184ab80d

Target point:
Commit: 59e6694405
Apr 16 2014, 4:01 PM

[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 453690]
2014-04-18 04:21:54 -05:00
Valeriy Kamyshniy
f557a92376 [P4/git history rebuild] more confusion caused by missing Ardour canvas autoscroll changes. Hopefull to be reverted by later commits from a merge by Paul and Grygorii 2014-05-27 21:34:27 -04:00
Paul Davis
65b4308c84 first pass at quantizing vertical scroll to whole tracks.
Dragging regions vertically does the quantization BUT speed control is lacking and the region ends up on
a track that is still invisible ... to be fixed as the sun rises.
2014-03-21 07:02:32 -04:00
Paul Davis
9df3157dfc big rework of scrolling, horizontal part considered almost 100% done.
Many more changes than I would typically like in a single commit, but this was all very intertwined.
Vertical scrolling using track-stepping still to follow.
2014-03-20 13:29:45 -04:00
Paul Davis
aff595c739 add ::covered_by_y_range() to TimeAxisView 2014-02-25 21:53:04 -05:00
Paul Davis
19bd344c33 indentation 2014-01-10 11:56:15 -05:00
Paul Davis
08b485db75 send enter events to EVERY newly entered item (ignore the bool return from the event handler); other canvas debugging aids;switch items_at_point() to use canvas coordinates 2013-11-03 10:07:00 -05:00
Robin Gareus
90e282c450 work around sparse motion notification events when tooltips are disabled
fixes http://tracker.ardour.org/view.php?id=5174
2013-08-08 15:23:10 -04:00
Paul Davis
580520b12f fix conflicts caused by meterbridge merge 2013-07-11 09:11:53 -04:00
Paul Davis
525cb6b4a7 some sort-of-deep fixes to get autoscroll/vertical scroll to work properly for cairocanvas 2013-07-10 19:10:06 -04:00
Robin Gareus
146fca3674 light up track seperator 2013-07-11 01:07:38 +02:00
Robin Gareus
4b39813d69 display separator on newly created tracks. 2013-07-11 00:38:43 +02:00
Robin Gareus
aabe526df2 update track-header layout - proper padding around meters 2013-07-10 15:27:06 +02:00
Robin Gareus
066b385c68 adjust padding of meters in time-axis view (still using border bg color) 2013-07-10 15:27:03 +02:00
Paul Davis
3031a99364 Merge branch 'master' into cairocanvas 2013-06-25 22:24:47 -04:00
Colin Fletcher
21914c884e Make scroll-wheel modifier keys consistent in main editor window.
Add constants for the keyboard modifiers that should be used for vertical
zoom, horizontal zoom, and horizontal scrolling in the main editor window,
and use these where appropriate rather than using Keyboard::PrimaryModifier
and friends directly.
2013-06-21 20:13:44 +01:00
Paul Davis
7de31d5a41 use virtual bool canvas_group_event () in TimeAxisViewItems to get suitably delegatable/inherited event handling 2013-04-25 16:06:12 -04:00
Paul Davis
6f664c1f67 many pervasive changes primarily related to waveform drawing, particular content-dragging, colors, and more 2013-04-24 15:42:14 -04:00
Paul Davis
d1a05240ef fix clamping of line and rect coordinates to avoid issues with cairo when drawing way outside a surface's dimensions; move various coordinate methods down to Canvas, because they don't require GTK information; make visible_area() a Canvas virtual method so that we don't have to cast to call it 2013-04-17 10:53:17 -04:00
Paul Davis
96eee9e7a1 change UIConfig to use accessor/setter methods like RCConfig so that ParameterChanged methods can actually be emitted; add variable (over a small range) background shading for all TimeAxisViewItems 2013-04-16 23:46:22 -04:00
Paul Davis
7e19053b88 Fix dragging objects on the canvas and remove redundant canvas groups
Delivery of fake motion events to the editor needed the event coordinates to be
in canvas space, as they are with "real" events. Editor and other objects had
many redundant groups from timbyr's work on gnomecanvas to scroll by moving
groups. We don't need this anymore with cairo-canvas (though possibly a
stationay background group for the canvas might be useful again one day as in
the SAE logo. Its implementation would be fairly different though, since we
would have to explicitly move the group on every scroll, since nothing else
ever moves on scroll).

Also tweaks to text item placement, and switch TimeAxisViewItem from
name_pixbuf to name_text, since ArdourCanvas::Text is already "pixbuf optimized".
2013-04-15 13:50:05 -04:00