Merge branch 'release_0530' of http://10.33.23.250:9080/orca_soft/orca_flashforge into release_0530

Author: wangjunxiang

src/slic3r/GUI/Field.cpp

@@ -965,6 +965,9 @@ void TextCtrl::set_value(const boost::any& value, bool change_event/* = false*/)
         text_ctrl()->SetValue(value.empty() ? "" : boost::any_cast<wxString>(value)); // BBS // BBS: null value
     m_disable_change_event = false;
 
+    if (auto *input = dynamic_cast<::TextInput *>(window))
+        input->UpdateTextCtrlColours();
+
     if (!change_event) {
         wxString ret_str = text_ctrl()->GetValue();
         /* Update m_value to correct work of next value_was_changed().
@@ -1301,6 +1304,9 @@ void SpinCtrl::set_value(const boost::any& value, bool change_event) {
         dynamic_cast<SpinInput*>(window)->SetValue(tmp_value);
     }
     m_disable_change_event = false;
+
+    if (auto *input = dynamic_cast<SpinInput *>(window))
+        input->UpdateTextCtrlColours();
 }
 
 void SpinCtrl::msw_rescale()

src/slic3r/GUI/Plater.cpp

@@ -10260,12 +10260,30 @@ void Plater::priv::on_select_preset(wxCommandEvent &evt)
             std::string old_preset_name = wxGetApp().preset_bundle->printers.get_edited_preset().name;
             wxGetApp().preset_bundle->m_pre_selected_print_name = old_preset_name;
             wxGetApp().preset_bundle->m_printer_inherit = wxGetApp().app_config->get_bool("inherit_printer");
-            update_objects_position_when_select_preset([this, &preset_type, &preset_name]() {
+            bool preset_selected = false;
+            {
                 wxWindowUpdateLocker noUpdates2(sidebar->filament_panel());
-                wxGetApp().get_tab(preset_type)->select_preset(preset_name);
-                // update plater with new config
-                q->on_config_change(wxGetApp().preset_bundle->full_config());
-            });
+                preset_selected = wxGetApp().get_tab(preset_type)->select_preset(preset_name);
+                if (preset_selected) {
+                    // update plater with new config
+                    q->on_config_change(wxGetApp().preset_bundle->full_config());
+                }
+            }
+
+            if (!preset_selected) {
+                combo->update_from_bundle();
+                return;
+            }
+
+            wxGetApp().obj_list()->update_object_list_by_printer_technology();
+
+            // Re-clamp wipe tower positions to new bed boundaries after preset change
+            PartPlateList &cur_plate_list = this->partplate_list;
+            for (size_t plate_id = 0; plate_id < cur_plate_list.get_plate_list().size(); ++plate_id) {
+                cur_plate_list.set_default_wipe_tower_pos_for_plate(plate_id);
+            }
+
+            update();
 
 
             if (old_preset_name != preset_name && wxGetApp().app_config->get("auto_calculate_flush") == "all") {

src/slic3r/GUI/Widgets/SpinInput.cpp

@@ -2,6 +2,9 @@
 #include "Label.hpp"
 #include "Button.hpp"
 #include "TextCtrl.h"
+#ifdef __APPLE__
+#include "slic3r/Utils/MacDarkMode.hpp"
+#endif
 
 #include <wx/dcgraph.h>
 
@@ -103,6 +106,28 @@ void SpinInput::SetTextColor(StateColor const &color)
 {
     text_color = color;
     state_handler.update_binds();
+    UpdateTextCtrlColours();
+}
+
+void SpinInput::UpdateTextCtrlColours()
+{
+    if (!text_ctrl)
+        return;
+
+    const int states = state_handler.states();
+#ifdef __APPLE__
+    const wxColour bg = background_color.colorForStatesNoDark(states);
+    const wxColour fg = text_color.colorForStatesNoDark(states);
+#else
+    const wxColour bg = background_color.colorForStates(states);
+    const wxColour fg = text_color.colorForStates(states);
+#endif
+    text_ctrl->SetBackgroundColour(bg);
+    text_ctrl->SetForegroundColour(fg);
+#ifdef __APPLE__
+    Slic3r::GUI::set_textfield_native_colours(text_ctrl->GetHandle(), bg, fg, true);
+#endif
+    text_ctrl->Refresh();
 }
 
 void SpinInput::SetSize(wxSize const &size)
@@ -157,8 +182,7 @@ bool SpinInput::Enable(bool enable)
         wxCommandEvent e(EVT_ENABLE_CHANGED);
         e.SetEventObject(this);
         GetEventHandler()->ProcessEvent(e);
-        text_ctrl->SetBackgroundColour(background_color.colorForStates(state_handler.states()));
-        text_ctrl->SetForegroundColour(text_color.colorForStates(state_handler.states()));
+        UpdateTextCtrlColours();
         button_inc->Enable(enable);
         button_dec->Enable(enable);
     }

src/slic3r/GUI/Widgets/SpinInput.hpp

@@ -58,6 +58,8 @@ class SpinInput : public wxNavigationEnabled<StaticBox>
 
     void SetTextColor(StateColor const &color);
 
+    void UpdateTextCtrlColours();
+
     void SetSize(wxSize const &size);
 
     void Rescale();

src/slic3r/GUI/Widgets/TextInput.cpp

@@ -2,6 +2,9 @@
 #include "Label.hpp"
 #include "TextCtrl.h"
 #include "slic3r/GUI/Widgets/Label.hpp"
+#ifdef __APPLE__
+#include "slic3r/Utils/MacDarkMode.hpp"
+#endif
 
 #include <wx/dcclient.h>
 #include <wx/dcgraph.h>
@@ -63,8 +66,7 @@ void TextInput::Create(wxWindow *     parent,
     text_ctrl = new TextCtrl(this, wxID_ANY, text, {4, 4}, wxDefaultSize, style | wxBORDER_NONE | wxTE_PROCESS_ENTER);
     text_ctrl->SetFont(Label::Body_14);
     text_ctrl->SetInitialSize(text_ctrl->GetBestSize());
-    text_ctrl->SetBackgroundColour(background_color.colorForStates(state_handler.states()));
-    text_ctrl->SetForegroundColour(text_color.colorForStates(state_handler.states()));
+    UpdateTextCtrlColours();
     state_handler.attach_child(text_ctrl);
     text_ctrl->Bind(wxEVT_KILL_FOCUS, [this](auto &e) {
         OnEdit();
@@ -141,6 +143,28 @@ void TextInput::SetTextColor(StateColor const& color)
 {
     text_color= color;
     state_handler.update_binds();
+    UpdateTextCtrlColours();
+}
+
+void TextInput::UpdateTextCtrlColours()
+{
+    if (!text_ctrl)
+        return;
+
+    const int states = state_handler.states();
+#ifdef __APPLE__
+    const wxColour bg = background_color.colorForStatesNoDark(states);
+    const wxColour fg = text_color.colorForStatesNoDark(states);
+#else
+    const wxColour bg = background_color.colorForStates(states);
+    const wxColour fg = text_color.colorForStates(states);
+#endif
+    text_ctrl->SetBackgroundColour(bg);
+    text_ctrl->SetForegroundColour(fg);
+#ifdef __APPLE__
+    Slic3r::GUI::set_textfield_native_colours(text_ctrl->GetHandle(), bg, fg, true);
+#endif
+    text_ctrl->Refresh();
 }
 
 void TextInput::Rescale()
@@ -160,8 +184,7 @@ bool TextInput::Enable(bool enable)
         wxCommandEvent e(EVT_ENABLE_CHANGED);
         e.SetEventObject(this);
         GetEventHandler()->ProcessEvent(e);
-        text_ctrl->SetBackgroundColour(background_color.colorForStates(state_handler.states()));
-        text_ctrl->SetForegroundColour(text_color.colorForStates(state_handler.states()));
+        UpdateTextCtrlColours();
     }
     return result;
 }

src/slic3r/GUI/Widgets/TextInput.hpp

@@ -56,6 +56,8 @@ class TextInput : public wxNavigationEnabled<StaticBox>
 
     void SetTextColor(StateColor const &color);
 
+    void UpdateTextCtrlColours();
+
     virtual void Rescale();
 
     virtual bool Enable(bool enable = true) override;

src/slic3r/Utils/MacDarkMode.hpp

@@ -2,6 +2,7 @@
 #define slic3r_MacDarkMode_hpp_
 
 #include <wx/event.h>
+#include <wx/colour.h>
 
 namespace Slic3r {
 namespace GUI {
@@ -12,6 +13,7 @@ extern double mac_max_scaling_factor();
 extern void set_miniaturizable(void * window);
 void WKWebView_evaluateJavaScript(void * web, wxString const & script, void (*callback)(wxString const &));
 void WKWebView_setTransparentBackground(void * web);
+void set_textfield_native_colours(void * window, const wxColour& background, const wxColour& foreground, bool draws_background);
 void set_tag_when_enter_full_screen(bool isfullscreen);
 void set_title_colour_after_set_title(void * window);
 void initGestures(void * view,  wxEvtHandler * handler);

src/slic3r/Utils/MacDarkMode.mm

@@ -23,6 +23,27 @@ @implementation MacDarkMode
 NSTextField* mainframe_text_field = nil;
 bool is_in_full_screen_mode = false;
 
+static NSTextField* find_text_field(NSView *view)
+{
+    if (view == nil)
+        return nil;
+    if ([view isKindOfClass:[NSTextField class]])
+        return (NSTextField *) view;
+    for (NSView *subview in [view subviews]) {
+        if (NSTextField *field = find_text_field(subview))
+            return field;
+    }
+    return nil;
+}
+
+static NSColor* ns_color_from_wx(const wxColour& color)
+{
+    return [NSColor colorWithCalibratedRed:color.Red() / 255.0
+                                     green:color.Green() / 255.0
+                                      blue:color.Blue() / 255.0
+                                     alpha:color.Alpha() / 255.0];
+}
+
 bool mac_dark_mode()
 {
     NSString *style = [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"];
@@ -41,6 +62,20 @@ bool mac_dark_mode()
 	}
     return scaling;
 }
+
+void set_textfield_native_colours(void * window, const wxColour& background, const wxColour& foreground, bool draws_background)
+{
+    NSTextField *field = find_text_field((NSView *) window);
+    if (field == nil)
+        return;
+
+    if (@available(macOS 10.14, *))
+        field.appearance = [NSAppearance appearanceNamed:NSAppearanceNameAqua];
+
+    field.drawsBackground = draws_background ? YES : NO;
+    field.backgroundColor = ns_color_from_wx(background);
+    field.textColor = ns_color_from_wx(foreground);
+}
 
 void set_miniaturizable(void * window)
 {