mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-15 11:51:33 +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:
@@ -32,6 +32,11 @@
|
||||
#include "wx/evtloop.h"
|
||||
#include "Label.hpp"
|
||||
|
||||
#ifdef __WXGTK__
|
||||
#include "slic3r/GUI/Widgets/StateColor.hpp"
|
||||
#include "slic3r/GUI/GUI_Utils.hpp"
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// constants
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -237,10 +242,19 @@ bool ProgressDialog::Create(const wxString &title, const wxString &message, int
|
||||
|
||||
if (!HasPDFlag(wxPD_NO_PROGRESS)) {
|
||||
m_gauge = new wxGauge(this, wxID_ANY, maximum, wxDefaultPosition, PROGRESSDIALOG_GAUGE_SIZE, gauge_style);
|
||||
#ifdef __WXGTK__
|
||||
SetGaugeColor(m_gauge,
|
||||
StateColor::darkModeColorFor(wxColour("#009688")).GetAsString(),
|
||||
StateColor::darkModeColorFor(wxColour("#D9D9D9")).GetAsString()
|
||||
);
|
||||
m_gauge->SetValue(0);
|
||||
#else
|
||||
m_gauge->Pulse(); // colors not applied without this. probably it switches to a dc painted version of progressbar
|
||||
m_gauge->SetValue(0);
|
||||
m_gauge->SetForegroundColour(wxColour("#009688"));
|
||||
m_gauge->SetBackgroundColour(wxColour("#D9D9D9"));
|
||||
wxGetApp().UpdateDarkUI(m_gauge);
|
||||
#endif
|
||||
m_sizer_main->Add(m_gauge, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(28));
|
||||
}
|
||||
|
||||
@@ -837,7 +851,7 @@ ProgressDialog::~ProgressDialog()
|
||||
|
||||
void ProgressDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags /*= wxSIZE_AUTO*/)
|
||||
{
|
||||
if (m_button_cancel != nullptr) { m_button_cancel->SetMinSize(PROGRESSDIALOG_CANCEL_BUTTON_SIZE); }
|
||||
//if (m_button_cancel != nullptr) { m_button_cancel->SetMinSize(PROGRESSDIALOG_CANCEL_BUTTON_SIZE); }
|
||||
|
||||
#ifdef __WXMSW__
|
||||
//if (m_block_left != nullptr && m_block_right != nullptr) {
|
||||
|
||||
Reference in New Issue
Block a user