mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-03-14 20:20:35 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,351 Commits 9 Branches 61 Tags
31d27d20994a959e0caebf35e7f26c314ff0f529
Commit Graph

58 Commits

Author SHA1 Message Date
Steffen Baranowsky
31d27d2099 don't allow dragging TCOs in BBEditor (#3832) 
* don't allow dragging TCOs in BBEditor

* change bbtrack detecting

* code improvements
 2017-10-03 00:53:49 +02:00
Oskar Wallgren
29d8734c51 Save track height under a separate name, 'trackheight' (#3840) 2017-10-02 15:10:33 +02:00
Steffen Baranowsky
9b5d3790b0 shortcut refactor for songeditor (#3649) 
* shortcut refactor for songeditor

* Ctrl-modifier for copy Tcos

* QAction()::trigger methode qt4 compatible
 2017-08-27 12:23:08 +02:00
Michael Gregorius
17f1856c84 Add back the rendering of text shadows for pattern labels 
Add back the rendering of text shadows for pattern labels. If some
design does not want shadows beneath the text it's always possible to
set the CSS property qproperty-textShadowColor to something completely
transparent.
 2017-07-20 19:53:02 +02:00
Michael Gregorius
a81b14b6cf Handle cases where elided text becomes empty or "..." 
Render the whole text if the elided text becomes empty or if it only
contains one character, i.e. if it becomes "…". Solved as implemented
because I was not able to check for "…" explicitly, i.e. the comparison
against "…" still failed.
 2017-07-20 19:53:02 +02:00
Michael Gregorius
f15fe18360 Expose the background color of the text labels in the style sheet 
Add a new property "textBackgroundColor" to TrackContentObjectView to
expose the property to the style sheets. Use this property in the code
that renders the text labels.

Adjust the two existing style sheets.
 2017-07-20 19:53:02 +02:00
Michael Gregorius
a23e344886 Make text rendering consistent for TrackContentObjectViews 
Add the method paintTextLabel to TrackContentObjectView. This methods
implements the painting of a given text on a given painter. The new
implementation does not draw any text label in case the trimmed text
becomes empty.

Use the method paintTextLabel to paint the text for automation patterns,
BB patterns and instrument patterns.

Adjust the style sheet of the classic and default theme by moving the
font definition from PatternView into TrackContentObjectView so that it
can be used by all inheriting classes.
 2017-07-20 19:53:02 +02:00
Michael Gregorius
ebc9137a0f Restore the track height when loading files 
The track height is already stored for every file that is saved. Remove a
condition that prevents its retrieval from files.

The removed condition was added as a fix for an issue with the number
#3585927 but it was not possible anymore to find out what this issue was
about.
 2017-07-16 11:58:13 +02:00
Lukas W
6004edae5c Include past automation patterns in processing (#3382) 
Fixes #662

* Include past automation tracks in processing
* Track::getTCOsInRange: Use binary search, fix doc
* Automation refactorings
* Add automation tests
 2017-03-26 12:27:15 +02:00
Lukas W
29f832034a Remove unused includes (#3429) 2017-03-16 11:35:18 +00:00
Oskar Wallgren
06e4033cb9 Don't count muted tracks in track length (#3390) 
* Don't count muted tracks to length on render

* Don't count muted TCO's to length on render
 2017-03-01 07:27:43 +01:00
grejppi
9e85d7c66e update all copyright headers to the proper url (#3326) 2017-02-06 02:41:15 +02:00
BaraMGB
43a77a0219 Let sample tracks play from any song position (#3133) 
* play sampletracks from any song position

* take care of TCO length

* TCOs shouldn't be updated when SE window is resized

* take care of zooming level

* takes care on all song position changes and mute/solo tracks now

* playes the sample only within the buffer limits

* takes care of time signature changes

* some minor code improvements (zapashcanon)

* loopback one tick earlier

* minor code changes

* get rid off clicks by resize and scrolling song editor

* removes playhandle by remove TCO

* minor bugs on manipulating TCOs in Song Editor

* update on add sample by playing

* white spaces 1
 2017-01-05 22:31:52 +01:00
Javier Serrano Polo
08d54d3179 Fix sample track view in BB editor (#3002) 2016-09-04 00:16:43 +00:00
Javier Serrano Polo
6614f567d7 Request change in model when dropping a track (#3000) 2016-09-04 00:15:21 +00:00
Javier Serrano Polo
703a42e77c Create BB-related TCOs along with BB-related tracks (#2981) 2016-08-25 05:11:43 +02:00
Umcaruje
b8f5f21177 Make the background of BB patterns themeable (#2942) 
* Make the background of BB patterns themeable

* Lighten up the color, make the BB background borderless
 2016-08-02 14:45:45 +02:00
Oskar Wallgren
04dd35e57f Move cloned track up incrementally (#2950) 2016-08-02 13:00:00 +02:00
Javier Serrano Polo
db89483e8e Create cloned track when the mixer is ready 2016-07-11 23:51:45 +02:00
Umcaruje
f136ba3097 Refactor the drawing of TCO's; Get rid of hardcoded colors in TCOs; Make TCO gradient configurable; Even out the color scheme 
Thanks to @Fastigium for helping with the BB Pattern redraw problem
 2016-03-02 21:58:27 +01:00
Umcaruje
8b7c295fc0 Fix incorrect UI for Automation Track on Mac OS X 2016-02-02 11:51:03 +01:00
Tres Finocchiaro
aaa798c746 Remove hard-coded grid from SongEditor 2015-11-13 21:21:19 -05:00
Colin Wallace
85b6a92460 Display the 'muted' attribute as "mute" to match the wording of "solo" 2015-04-21 19:12:29 +00:00
Tres Finocchiaro
6e68eca6f8 Merge pull request #1704 from badosu/fix-cloned-track-position 
Fix cloned track position
 2015-04-20 14:30:09 +00:00
Colin Wallace
f12fa52a69 remove unused vars: TRACK_OP_BTN_(WIDTH|HEIGHT) 2015-04-20 03:37:55 +00:00
Amadeus Folego
33893e51c4 Move cloned tracks under the original 2015-03-07 12:00:20 -03:00
Jonas Trappenberg
76ffbd6528 Merge branch 'master' into coding 
Conflicts:
	include/Plugin.h
	src/core/Note.cpp
	src/core/Track.cpp
 2015-01-31 19:11:33 -08:00
Amadeus Folego
c99e47f581 Add "Assign to new FX Channel" action to FXSpinBox 
Fix #604 #921
 2015-01-30 13:25:10 -02:00
Amadeus Folego
06cb85b771 Move FX assignment/creation logic to InsTrackView 2015-01-30 13:25:10 -02:00
Tres Finocchiaro
e2d98668ec Merge pull request #1699 from curlymorphic/bbundo 
Song Editor and bbEditor undo.
 2015-01-29 15:39:43 -05:00
Tres Finocchiaro
824f7fa706 Merge pull request #1712 from curlymorphic/i1532 
Proposed fix for #1532 Tracks in song editor cannot be moved in pattern ...
 2015-01-28 20:37:03 -05:00
Dave French
dd80301cee Proposed fix for #1532 Tracks in song editor cannot be moved in pattern select mode. 2015-01-28 15:35:01 +00:00
Dave French
a30c32f8d8 Undo of TCO changes in song editor 2015-01-27 00:11:23 +00:00
Dave French
0fe2ab5533 Proposed fix 1685 Automation Copy/Paste from Context Menu 2015-01-25 20:07:53 +00:00
Alexandre
2834bd17f4 Coding conventions update 2015-01-20 00:00:58 -02:00
Alexandre Almeida
118127a3bc Update coding conventions 2015-01-19 23:09:46 -02:00
Amadeus Folego
2eb420cb92 Add "Assign to FX Channel" context button to track 2015-01-13 00:45:48 -02:00
Lukas W
56055b36b0 Merge branch 'master' into ed_refac 
Conflicts:
	src/gui/editors/PianoRoll.cpp
 2015-01-11 13:25:55 +01:00
Tres Finocchiaro
86c2673398 Merge pull request #1563 from DanWin/resize-cursor 
Don't display resize cursor for non-resizable TCOs
 2015-01-10 09:32:09 -05:00
Daniel Winzen
4a55e1c46a Performance and other fixes 2015-01-09 20:17:07 +01:00
Dave French
7b3e4265b8 Proposed fix 1388 Remove auto-naming of copied blocks 2015-01-08 06:15:18 +00:00
Lukas W
748cccd266 Merge branch 'gui_application' into ed_refac 
Conflicts:
	src/core/Song.cpp
	src/gui/MainWindow.cpp
 2015-01-07 00:03:32 +01:00
Lukas W
23e0e0fb8e Merge branch 'master' into ed_refac 
Conflicts:
	include/AutomationEditor.h
	include/SongEditor.h
	plugins/delay/delaycontrols.cpp
	plugins/delay/delaycontrolsdialog.cpp
	src/gui/editors/AutomationEditor.cpp
	src/gui/editors/BBEditor.cpp
	src/gui/editors/PianoRoll.cpp
 2015-01-06 23:05:13 +01:00
Daniel Winzen
7440794597 Don't display resize cursor for non-resizable TCOs 2015-01-06 18:18:16 +01:00
Rüdiger Ranft
91124495eb Merge upstream changes. 2014-12-19 17:21:16 +01:00
Rüdiger Ranft
8d6a17a047 Merge Brush-Bugfix 2014-12-19 17:00:09 +01:00
Lukas W
1ee93409d1 Move Engine' GUI code to new GuiApplication class 2014-12-17 23:25:55 +01:00
Lukas W
7c508f7900 Merge master into ed_refac 2014-12-09 00:20:28 +01:00
Lukas W
ed8e30b4ee Small const fix 2014-12-08 20:19:51 +01:00
Lukas W
d029c8513a BBEditor: Use Editor superclass 2014-12-08 18:23:01 +01:00