juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-14 00:52:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX:fix display in mac

Browse Source 
jira: STUDIO-10130 STUDIO-10062
Change-Id: Ie98b19cdd3ead958940a8730e6091fc74be05ad8
(cherry picked from commit f5133d9d431ee562148afb1488ddab24c911c16d)
This commit is contained in:
zhou.xu
2025-01-23 19:58:31 +08:00
committed by Noisyfox
parent 1b90abe640
commit 5667d9a402
2 changed files with 5 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
resources/images/filament_transparent.svg
View File

@@ -1,39 +1 @@
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="19.7593" y="9.39136" width="3.59999" height="3.5734" fill="#D9D9D9"/>
<rect x="12.5596" y="5.81812" width="3.59999" height="3.5734" fill="white"/>
<rect x="16.1592" y="5.81812" width="3.59999" height="3.5734" fill="#D9D9D9"/>
<rect x="8.62891" y="5.81812" width="3.92951" height="3.5734" fill="#D9D9D9"/>
<rect x="12.5591" y="9.39136" width="3.59999" height="3.5734" fill="#D9D9D9"/>
<rect x="19.7598" y="5.81812" width="3.59999" height="3.5734" fill="white"/>
<rect x="16.1597" y="9.39136" width="3.59999" height="3.5734" fill="white"/>
<rect x="8.62939" y="9.39136" width="3.92951" height="3.5734" fill="white"/>
<rect x="19.7593" y="16.5383" width="3.59999" height="3.5734" fill="#D9D9D9"/>
<rect x="12.5591" y="12.9648" width="3.59999" height="3.5734" fill="white"/>
<rect x="16.1597" y="12.9648" width="3.59999" height="3.5734" fill="#D9D9D9"/>
<rect x="8.62939" y="12.9648" width="3.92951" height="3.5734" fill="#D9D9D9"/>
<rect x="12.5591" y="16.5383" width="3.59999" height="3.5734" fill="#D9D9D9"/>
<rect x="19.7593" y="12.9648" width="3.59999" height="3.5734" fill="white"/>
<rect x="16.1597" y="16.5383" width="3.59999" height="3.5734" fill="white"/>
<rect x="8.62939" y="16.5383" width="3.92951" height="3.5734" fill="white"/>
<rect x="19.7593" y="23.6853" width="3.59999" height="3.5734" fill="#D9D9D9"/>
<rect x="12.5591" y="20.1116" width="3.59999" height="3.5734" fill="white"/>
<rect x="16.1597" y="20.1116" width="3.59999" height="3.5734" fill="#D9D9D9"/>
<rect x="8.62939" y="20.1116" width="3.92951" height="3.5734" fill="#D9D9D9"/>
<rect x="12.5591" y="23.6853" width="3.59999" height="3.5734" fill="#D9D9D9"/>
<rect x="19.7593" y="20.1116" width="3.59999" height="3.5734" fill="white"/>
<rect x="16.1597" y="23.6853" width="3.59999" height="3.5734" fill="white"/>
<rect x="8.62939" y="23.6853" width="3.92951" height="3.5734" fill="white"/>
<rect x="19.7593" y="30.6084" width="3.59999" height="3.5734" fill="#D9D9D9"/>
<rect x="12.5591" y="27.0354" width="3.59999" height="3.5734" fill="white"/>
<rect x="16.1597" y="27.0354" width="3.59999" height="3.5734" fill="#D9D9D9"/>
<rect x="8.62939" y="27.0354" width="3.92951" height="3.5734" fill="#D9D9D9"/>
<rect x="12.5591" y="30.6084" width="3.59999" height="3.5734" fill="#D9D9D9"/>
<rect x="19.7593" y="27.0354" width="3.59999" height="3.5734" fill="white"/>
<rect x="16.1597" y="30.6084" width="3.59999" height="3.5734" fill="white"/>
<rect x="8.62939" y="30.6084" width="3.92951" height="3.5734" fill="white"/>
<path d="M23.2596 37.5131C25.5229 37.5131 27.3577 29.5764 27.3577 19.7859C27.3577 9.99536 25.5229 2.05859 23.2596 2.05859C22.3784 2.05859 21.3802 3.55703 20.7119 5.60405H22.2969C22.7771 6.93611 23.7442 11.4734 23.7442 20.5097C23.7442 29.546 22.4689 33.0115 22.2969 34.0043H20.8278C21.5273 36.4088 22.2967 37.5131 23.2596 37.5131Z" fill="#F2F2F2"/>
<path d="M20.7119 5.60405C21.3802 3.55703 22.3784 2.05859 23.2596 2.05859C25.5229 2.05859 27.3577 9.99536 27.3577 19.7859C27.3577 29.5764 25.5229 37.5131 23.2596 37.5131C22.2967 37.5131 21.4114 36.0767 20.7119 33.6722" stroke="#5C5C5C" stroke-width="2"/>
<path d="M8.62891 5.60352H22.3115C23.2206 8.8144 23.7331 14.1019 23.7331 20.0808C23.7331 25.7062 23.1308 30.7196 22.3115 33.9672H8.62891" stroke="#5C5C5C"/>
<path d="M6.51399 37.5132C8.68286 37.5132 10.4411 29.5764 10.4411 19.7859C10.4411 9.99538 8.68286 2.05859 6.51399 2.05859C4.34513 2.05859 2.58691 9.99538 2.58691 19.7859C2.58691 29.5764 4.34513 37.5132 6.51399 37.5132Z" fill="#F2F2F2" stroke="#5C5C5C" stroke-width="2"/>
<path d="M6.21159 22.7401C6.54526 22.7401 6.81576 21.5495 6.81576 20.081C6.81576 18.6124 6.54526 17.4219 6.21159 17.4219C5.87792 17.4219 5.60742 18.6124 5.60742 20.081C5.60742 21.5495 5.87792 22.7401 6.21159 22.7401Z" fill="#5C5C5C"/>
</svg>
<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 23"><title>12312</title><path d="M16.59,11.47c0-6.44-1.27-7.81-1.57-8H7.07A21.4,21.4,0,0,1,8.38,11.5a21.4,21.4,0,0,1-1.31,8.07h8C15.33,19.32,16.59,17.9,16.59,11.47Z" fill="#fff" stroke="#6b6b6b"/><polygon points="6.64 19.18 6.64 19.18 6.95 19.18 6.95 19.18 6.64 19.18" fill="#c9c9c9"/><path d="M13.38,19.18V16H16a27.74,27.74,0,0,0,.26-3.23H13.38V9.66H10.05V6.51h3.41V9.66h2.77a23.33,23.33,0,0,0-.33-3.15H13.38V3.82H10.05V6.51H7.62A25.41,25.41,0,0,1,8,9.66h2.05V12.8H8A26,26,0,0,1,7.73,16h2.32v3.15h3.33Zm-3.33-6.3h3.41V16H10.05Z" fill="#c9c9c9"/><path d="M8,12.8h2V9.66H8c0,.63.06,1.27.06,1.94C8.06,12,8.05,12.41,8,12.8Z" fill="#fff"/><path d="M10.05,19.18V16H7.73A16.45,16.45,0,0,1,7,19.18Z" fill="#fff"/><path d="M13.38,19.18H15.1A8.83,8.83,0,0,0,16,16H13.38Z" fill="#fff"/><path d="M13.38,6.51H15.9A6.77,6.77,0,0,0,15,3.82H13.38Z" fill="#fff"/><path d="M10.05,6.51V3.82H6.87a14.66,14.66,0,0,1,.75,2.69Z" fill="#fff"/><rect x="10.05" y="12.88" width="3.41" height="3.15" fill="#fff"/><path d="M13.46,9.66h-.08V12.8h2.88c0-.38,0-.79,0-1.22,0-.7,0-1.34,0-1.92Z" fill="#fff"/><polygon points="13.46 9.66 13.46 6.51 10.05 6.51 10.05 9.66 13.38 9.66 13.38 9.66 13.46 9.66" fill="#fff"/><rect x="13.38" y="9.66" width="0.08" fill="#c9c9c9"/><path d="M5.35,21.31c1.68,0,3-4.39,3-9.81S7,1.69,5.35,1.69s-3,4.39-3,9.81S3.68,21.31,5.35,21.31Z" fill="#fff" stroke="#6b6b6b"/><path d="M4.89,13c.26,0,.46-.66.46-1.47S5.15,10,4.89,10s-.47.66-.47,1.47S4.63,13,4.89,13Z" fill="#6b6b6b"/><path d="M16.65,21.31c1.67,0,3-4.39,3-9.81s-1.35-9.81-3-9.81c-.63,0-1.22.62-1.7,1.69h0s1.63.84,1.63,8.09S15,19.61,15,19.62h0C15.43,20.69,16,21.31,16.65,21.31Z" fill="none" stroke="#6b6b6b" stroke-miterlimit="10" fill-rule="evenodd"/></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

8
src/slic3r/GUI/AmsMappingPopup.cpp
View File

@@ -34,8 +34,8 @@ const int LEFT_OFFSET = 2;
{
m_arraw_bitmap_gray = ScalableBitmap(this, "drop_down2", FromDIP(8));
m_arraw_bitmap_white = ScalableBitmap(this, "topbar_dropdown", 12);
m_transparent_mitem = ScalableBitmap(this, "transparent_material_up", FromDIP(16));
m_filament_wheel_transparent = ScalableBitmap(this, "filament_transparent", FromDIP(20));//wxGetApp().dark_mode() ? "filament_dark_transparent"
m_transparent_mitem = ScalableBitmap(this, "transparent_material_up", 20);
m_filament_wheel_transparent = ScalableBitmap(this, "filament_transparent", 25);//wxGetApp().dark_mode() ? "filament_dark_transparent"
//m_ams_wheel_mitem = ScalableBitmap(this, "ams_wheel", FromDIP(25));
m_ams_wheel_mitem = ScalableBitmap(this, "ams_wheel_narrow", 25);
m_ams_not_match = ScalableBitmap(this, "filament_not_mactch", 25);
@@ -316,7 +316,7 @@ void MaterialItem::doRender(wxDC& dc)
wheel_left += m_ams_wheel_mitem.GetBmpSize().x;
dc.DrawBitmap(m_ams_not_match.bmp(), (size.x - m_ams_not_match.GetBmpWidth()) / 2 - FromDIP(LEFT_OFFSET), wheel_top);
} else {
if (mcolor.Alpha() == 0) {
if (acolor.Alpha() == 0) {
dc.DrawBitmap(m_filament_wheel_transparent.bmp(), wheel_left - FromDIP(LEFT_OFFSET), wheel_top);
} else {
dc.DrawBitmap(m_ams_wheel_mitem.bmp(), wheel_left - FromDIP(LEFT_OFFSET), wheel_top);
@@ -508,7 +508,7 @@ void MaterialSyncItem::doRender(wxDC &dc)
auto wheel_left = (GetSize().x / 2 - m_ams_wheel_mitem.GetBmpSize().x) / 2 + FromDIP(2);
auto wheel_top = ((float) GetSize().y * 0.6 - m_ams_wheel_mitem.GetBmpSize().y) / 2 + (float) GetSize().y * 0.4;
if (m_match) {// different with parent
if (mcolor.Alpha() == 0) {
if (acolor.Alpha() == 0) {
dc.DrawBitmap(m_filament_wheel_transparent.bmp(), wheel_left - FromDIP(LEFT_OFFSET), wheel_top);
} else {
dc.DrawBitmap(m_ams_wheel_mitem.bmp(), wheel_left - FromDIP(LEFT_OFFSET), wheel_top);