3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-23 06:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'main' into dev/save-local-machine

Browse source
This commit is contained in:
Noisyfox 2025-02-02 15:00:25 +08:00
commit 991802a3a7
277 changed files with 9704 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/AboutDialog.cpp
View file

@ -235,7 +235,7 @@ AboutDialog::AboutDialog()
bool is_dark = wxGetApp().app_config->get("dark_color_mode") == "1";
// logo
m_logo_bitmap = ScalableBitmap(this, is_dark ? "OrcaSlicer_about" : "OrcaSlicer_about_dark", FromDIP(125));
m_logo_bitmap = ScalableBitmap(this, is_dark ? "OrcaSlicer_about_dark" : "OrcaSlicer_about", FromDIP(125));
m_logo = new wxStaticBitmap(this, wxID_ANY, m_logo_bitmap.bmp(), wxDefaultPosition,wxDefaultSize, 0);
m_logo->SetSizer(vesizer);

12
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -3519,6 +3519,12 @@ void GLCanvas3D::on_key(wxKeyEvent& evt)
m_dirty = true;
}
// set_cursor(Standard);
#ifdef __WXMSW__
if (m_camera_movement && m_is_touchpad_navigation) {
m_camera_movement = false;
m_mouse.set_start_position_3D_as_invalid();
}
#endif
}
else if (keyCode == WXK_CONTROL)
m_dirty = true;
@ -3873,6 +3879,12 @@ std::string format_mouse_event_debug_message(const wxMouseEvent &evt)
out += "RightUp ";
if (evt.RightDClick())
out += "RightDClick ";
if (evt.AltDown())
out += "AltDown ";
if (evt.ShiftDown())
out += "ShiftDown ";
if (evt.ControlDown())
out += "ControlDown ";
sprintf(buf, "(%d, %d)", evt.GetX(), evt.GetY());
out += buf;