mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-16 04:11:13 +00:00
UI Fixes / Improvements (#15074)
* plates-toolbar-scrollbar-size * update * filament grouping dialog * mixed filament list * Update StepMeshDialog.cpp * moves plot scrollbar * fix position of popups * printer agent combo box width * match multiline text control background * add dots to configure button * also correct label color for multiline input * side tools connecting text color * recenter dialog text color * preferences experimental features * upgrade panel hyperlink color + right margin * fix position of + sign on printer selector * speed control popup * bbl fan control window * AMS materials setting * monitor > ams section * match background color of multiline text editor on project page * Fix SwitchButton colors * bbl camera popup * BBL > Send print dialog * Revert "BBL > Send print dialog" This reverts commit128e145897. * Revert "bbl fan control window" This reverts commit4a0db62790. * Revert "bbl camera popup" This reverts commite2301e3237. * Revert "monitor > ams section" This reverts commit66e6894eb1. * Revert "fix position of + sign on printer selector" This reverts commit1523ba24c0. * Revert "upgrade panel hyperlink color + right margin" This reverts commit541f2514c5. * Revert "side tools connecting text color" This reverts commita9ab074247. * Revert "recenter dialog text color" This reverts commitf4670d32b2. * Revert "AMS materials setting" This reverts commitb12827f9b5. * Revert "Fix SwitchButton colors" This reverts commit2d4f1d1fe9. * match object list background color * match compare dialog wxDataViewCtrl background color * fix centering of iconized buttons on linux * fix compare dialog background color not applied on linux * edit gcode dialog components background color * Update Plater.cpp * fix dev button font size * Fix scaling issue on SwitchButton while using 150% * transfer or discard changes dialog wiki label * "Transfer or Discard changes" / "Unsaved Changes" dialog header color * object table colors & header spacing * progress dialog * fix progressbar look on linux * fix build * fix build * fix centering of iconized icon again * fix header background color * revert bbl fan control * add includes --------- Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
This commit is contained in:
@@ -315,7 +315,7 @@ void Button::render(wxDC& dc)
|
||||
auto szContent = textSize;
|
||||
// Whether the measured content reserved the text/icon gap. macOS measures an empty label
|
||||
// as 0-high, so the gap is skipped there; the dot must not advance past it in that case.
|
||||
const bool gap_reserved = szContent.y > 0;
|
||||
const bool gap_reserved = !text.IsEmpty(); // ORCA check empty string instead text size. fixes icon centering on linux
|
||||
if (icon.bmp().IsOk()) {
|
||||
if (gap_reserved) {
|
||||
// BBS norrow size between text and icon
|
||||
@@ -409,10 +409,11 @@ void Button::messureSize()
|
||||
if (this->active_icon.bmp().IsOk()) {
|
||||
if (szContent.y > 0) {
|
||||
// BBS narrow size between text and icon
|
||||
int spacing_after_icon = !GetLabel().IsEmpty() ? 0 : m_icon_spacing; // ORCA check empty string instead text size. fixes icon centering on linux
|
||||
if (vertical)
|
||||
szContent.y += m_icon_spacing;
|
||||
szContent.y += spacing_after_icon;
|
||||
else
|
||||
szContent.x += m_icon_spacing;
|
||||
szContent.x += spacing_after_icon;
|
||||
}
|
||||
wxSize szIcon = this->active_icon.GetBmpSize();
|
||||
if (vertical) {
|
||||
|
||||
Reference in New Issue
Block a user