Skip to content

Commit

Permalink
Give timeline docker a proper minimum height
Browse files Browse the repository at this point in the history
Making it show at least two tracks, which should be enough to also see
the "you haven't added any tracks yet" text. Otherwise the user may end
up with the timeline collapsed so far that they can only see the frame
indexes, which is confusing to a new user that may not know that
something is hidden from their view.
  • Loading branch information
askmeaboutlo0m committed Dec 18, 2023
1 parent 2cf90d4 commit 6309c8e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Unreleased Version 2.2.0-pre
* Server Fix: Show an error message if listing on a certain server is not allowed.
* Fix: Unlist sessions more reliably when terminating sessions hosted "on this computer".
* Fix: Don't select a newly created layer when there's a default layer.
* Fix: Give the timeline dock a sensible minimum height. Thanks Kink for reporting.

2023-12-08 Version 2.2.0-beta.11
* Server Fix: No longer show "cannot look up one session and then join another" when joining a session with an ID alias. Thanks Kink and Fabian for finding this.
Expand Down
2 changes: 2 additions & 0 deletions src/desktop/widgets/timelinewidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1492,6 +1492,8 @@ void TimelineWidget::updateTracks()
int effectiveTrackId = nextTrackId != 0 ? nextTrackId
: currentTrackId != 0 ? currentTrackId
: anyTrackId;
setMinimumHeight(
d->rowHeight * 3 + d->horizontalScroll->sizeHint().height());
setCurrent(effectiveTrackId, d->currentFrame, false, false);
updateActions();
updateScrollbars();
Expand Down

0 comments on commit 6309c8e

Please sign in to comment.