mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-17 12:51:03 +00:00
merge main
This commit is contained in:
1 parent
ccbb73baaf
commit
ecbd03fed7
868 files changed
+203633
-35823
No files matched your search
@@ -26,7 +26,6 @@
|
||||
#include "slic3r/GUI/Tabbook.hpp"
|
||||
#include <ctime>
|
||||
#include <map>
|
||||
#include "slic3r/GUI/Printer/PrinterFileSystem.h"
|
||||
#include "slic3r/GUI/Widgets/ComboBox.hpp"
|
||||
#include <wx/app.h>
|
||||
#include <wx/bookctrl.h>
|
||||
@@ -64,6 +63,10 @@
|
||||
#include "GUI_ObjectList.hpp"
|
||||
#include "MainFrame.hpp"
|
||||
#include "Widgets/Label.hpp"
|
||||
#include "slic3r/GUI/I18N.hpp"
|
||||
#include "slic3r/GUI/Plater.hpp"
|
||||
#include <wx/dcgraph.h>
|
||||
#include <wx/dcmemory.h>
|
||||
|
||||
namespace fs = boost::filesystem;
|
||||
|
||||
@@ -1151,6 +1154,7 @@ void AuxiliaryPanel::update_all_cover()
|
||||
m_sizer_description->Add(m_text_description, 0, wxALIGN_TOP | wxRIGHT, FromDIP(10));
|
||||
m_input_description = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition,
|
||||
wxSize(FromDIP(450), FromDIP(300)), wxTE_MULTILINE | wxTE_PROCESS_ENTER);
|
||||
m_input_description->SetBackgroundColour(*wxWHITE);
|
||||
m_input_description->SetFont(::Label::Body_14);
|
||||
m_sizer_description->Add(m_input_description, 0, wxALIGN_CENTER, 0);
|
||||
|
||||
|
||||
Reference in new issue
Block a user