Skip to content

Commit 97ecb1a

Browse files
committed
include all panels on toolbar if enough space
This uses a crude heuristic that is conservative based on verbose languages such as German. With icon text turned on, only a very wide window that approaches full HD will all. Otherwise, Files, Markers, and Notes are hidden.
1 parent 0f386c0 commit 97ecb1a

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

src/mainwindow.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -5245,6 +5245,11 @@ void MainWindow::on_actionShowTextUnderIcons_toggled(bool b)
52455245
ui->mainToolBar->setToolButtonStyle(b ? Qt::ToolButtonTextUnderIcon : Qt::ToolButtonIconOnly);
52465246
Settings.setTextUnderIcons(b);
52475247
updateLayoutSwitcher();
5248+
if (b && this->width() < 1900) {
5249+
ui->mainToolBar->removeAction(ui->actionFiles);
5250+
ui->mainToolBar->removeAction(ui->actionMarkers);
5251+
ui->mainToolBar->removeAction(ui->actionNotes);
5252+
}
52485253
}
52495254

52505255
void MainWindow::on_actionShowSmallIcons_toggled(bool b)

src/mainwindow.ui

+2
Original file line numberDiff line numberDiff line change
@@ -343,10 +343,12 @@
343343
<addaction name="actionAudioMeter"/>
344344
<addaction name="actionProperties"/>
345345
<addaction name="actionRecent"/>
346+
<addaction name="actionNotes"/>
346347
<addaction name="actionPlaylist"/>
347348
<addaction name="actionFiles"/>
348349
<addaction name="actionTimeline"/>
349350
<addaction name="actionFilters"/>
351+
<addaction name="actionMarkers"/>
350352
<addaction name="actionKeyframes"/>
351353
<addaction name="actionHistory"/>
352354
<addaction name="actionEncode"/>

0 commit comments

Comments
 (0)