Skip to content

New loop marker shortcuts, attempt 2 #6382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DomClark merged 19 commits into from
Dec 25, 2023
Merged

New loop marker shortcuts, attempt 2 #6382

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d06be0b
MVP
Spekular Apr 26, 2022
7dc9ac0
Simplify position calculations, remove unnecessary members
Spekular Apr 26, 2022
76bedae
Add dual-button mode
Spekular May 16, 2022
d4dcdd3
Cursor update refactor and hotspot bugfix
Spekular May 16, 2022
6e7fb1c
Add loop drag mode
Spekular May 16, 2022
6988715
Make handle color and width themeable
Spekular May 16, 2022
a5f055d
Set cursor and display handles when shift+hovering
Spekular May 31, 2022
7051105
Merge remote-tracking branch 'upstream/master' into loopMarkers2
DomClark Dec 18, 2023
f71eae3
Align handles with loop at all scale factors
DomClark Dec 19, 2023
13c0e76
Fix formatting
DomClark Dec 19, 2023
62d1e47
Improve cursor handling
DomClark Dec 20, 2023
8128d55
Improve shift modifier handling
DomClark Dec 21, 2023
64c6982
Make options translatable
DomClark Dec 21, 2023
adfb6c1
Add context menu
DomClark Dec 21, 2023
626dc6d
Tidy up further
DomClark Dec 21, 2023
5b43512
Address review feedback
DomClark Dec 22, 2023
70db42b
Rename loop edit mode option
DomClark Dec 22, 2023
c8ab1e6
Add missing `tr` calls
DomClark Dec 22, 2023
9ac3080
Scope variables more tightly
DomClark Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Scope variables more tightly
  • Loading branch information
@DomClark
DomClark committed Dec 22, 2023
commit 9ac308020b2e7af73fb4bd7bd03aaa0f29cbb72d
7 changes: 4 additions & 3 deletions src/gui/editors/TimeLineWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,13 @@ void TimeLineWidget::paintEvent( QPaintEvent * )

// Draw loop handles if necessary
const auto handleMode = ConfigManager::inst()->value("app", "loopmarkermode") == "handles";
const auto hw = std::min(m_loopHandleWidth, loopRectWidth / 2 - 1);
const auto leftHandle = QRectF(loopStart - .5, loopRectMargin - .5, hw, loopRectHeight);
const auto rightHandle = QRectF(loopEndR - hw - .5, loopRectMargin - .5, hw, loopRectHeight);
if (handleMode && underMouse() && QGuiApplication::keyboardModifiers().testFlag(Qt::ShiftModifier))
{
const auto handleWidth = std::min(m_loopHandleWidth, loopRectWidth / 2 - 1);
const auto leftHandle = QRectF(loopStart - .5, loopRectMargin - .5, handleWidth, loopRectHeight);
const auto rightHandle = QRectF(loopEndR - handleWidth - .5, loopRectMargin - .5, handleWidth, loopRectHeight);
const auto color = loopPointsActive ? m_activeLoopHandleColor : m_inactiveLoopHandleColor;

p.fillRect(leftHandle, color);
p.fillRect(rightHandle, color);
}
Expand Down