juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-11 11:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #176 from Snapmaker/dev_2.3.0_alves

Browse Source 
fix linux build failed
This commit is contained in:
Alves
2026-03-06 09:50:28 +08:00
committed by GitHub
parent 1fe3c71649 9457e6dd60
commit d105383434
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.metainfo.xml
View File

@@ -38,9 +38,9 @@
<color type="primary" scheme_preference="light">#009688</color> <color type="primary" scheme_preference="light">#009688</color>
</branding> </branding>
<releases> <releases>
<release version="2.2.1" date="2025-12-26"> <release version="2.2.4" date="2025-12-26">
<description> <description>
<p>Version 2.2.1 release with improvements and bug fixes.</p> <p>Version 2.2.4 release with improvements and bug fixes.</p>
</description> </description>
</release> </release>
</releases> </releases>

6
scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml
View File

@@ -104,12 +104,6 @@ modules:
url: https://github.com/SoftFever/Orca-deps-wxWidgets url: https://github.com/SoftFever/Orca-deps-wxWidgets
branch: master branch: master
path: ../ path: ../
- type: file
path: patches/0001-Enable-using-a-dark-theme-when-Gnome-dark-style-is-s.patch
dest-filename: wxwidgets-dark-theme.patch
- type: shell
commands:
- patch -p1 < wxwidgets-dark-theme.patch
cleanup: cleanup:
- "*.la" - "*.la"
- "*.a" - "*.a"

3
src/slic3r/GUI/ObjectDataViewModel.cpp
View File

@@ -554,6 +554,9 @@ void ObjectDataViewModel::UpdateBitmapForNode(ObjectDataViewModelNode *node)
scaled_bitmap_name += std::to_string(vol_type); scaled_bitmap_name += std::to_string(vol_type);
scaled_bitmap_name += (wxGetApp().dark_mode() ? "-dm" : "-lm"); scaled_bitmap_name += (wxGetApp().dark_mode() ? "-dm" : "-lm");
if (!m_bitmap_cache)
return;
wxBitmap* bmp = m_bitmap_cache->find(scaled_bitmap_name); wxBitmap* bmp = m_bitmap_cache->find(scaled_bitmap_name);
if (bmp == nullptr) { if (bmp == nullptr) {
std::vector<wxBitmap> bmps; std::vector<wxBitmap> bmps;