Skip to content

Commit

Permalink
Give wheel, palette and navigator a minimum size
Browse files Browse the repository at this point in the history
So that they can't be squished into oblivion. The minimum size is still
very small to avoid causing trouble for users with dinky resolutions,
but they now no longer at zero, where you could have a dock that's
confusingly just a header.

Relates to #1349.
  • Loading branch information
askmeaboutlo0m committed Jul 22, 2024
1 parent 7fbeb54 commit 9e3be89
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ Unreleased Version 2.2.2-pre
* Fix: Compensate for discontinuity in the classic soft brush radius to make the transition look less bumpy. Thanks BulletPepper for reporting.
* Feature: Make color sliders dock smaller by showing only one set of sliders at a time and add an input field for a hex color name. Thanks Kawaxte and MorrowShore for suggesting.
* Fix: Don't switch tools while typing into text fields in some situations. Thanks leopardheart982 for reporting.
* Fix: Give color wheel, color palette and navigator docks a minimum size so that they can't be shrunken into nonexistence. Thanks vipperz for reporting.

2024-02-25 Version 2.2.2-beta.1
* Server Feature: Allow adding a message when kicking someone through the admin API.
Expand Down
1 change: 1 addition & 0 deletions src/desktop/docks/colorpalette.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ ColorPaletteDock::ColorPaletteDock(const QString &title, QWidget *parent)
choiceLayout->addWidget(menuButton);

d->paletteWidget = new widgets::PaletteWidget{this};
d->paletteWidget->setMinimumHeight(20);
layout->addWidget(d->paletteWidget, 1);
connect(
d->paletteWidget, &widgets::PaletteWidget::colorSelected, this,
Expand Down
1 change: 1 addition & 0 deletions src/desktop/docks/colorspinner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ ColorSpinnerDock::ColorSpinnerDock(const QString& title, QWidget *parent)

// Create main widget
d->colorwheel = new color_widgets::ColorWheel(this);
d->colorwheel->setMinimumSize(64, 64);
setWidget(d->colorwheel);

connect(d->colorwheel, &color_widgets::ColorWheel::colorSelected, this, &ColorSpinnerDock::colorSelected);
Expand Down
1 change: 1 addition & 0 deletions src/desktop/docks/navigator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,7 @@ Navigator::Navigator(QWidget *parent)
m_view->addAction(realtimeUpdateAction);

m_view->setContextMenuPolicy(Qt::ActionsContextMenu);
m_view->setMinimumHeight(32);

auto &settings = dpApp().settings();
settings.bindNavigatorShowCursors(showCursorsAction);
Expand Down

0 comments on commit 9e3be89

Please sign in to comment.