mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-12-24 00:28:38 -07:00
Merge branch 'main' into dev/p2s-pr
This commit is contained in:
Noisyfox
GitHub
commit
df734857cc
14 changed files with 26 additions and 89 deletions
|
|
@ -1,7 +1 @@
|
|||
<svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M4.07262 4.61082C3.35049 5.95191 2.88086 7.8561 2.88086 10.0005C2.88086 12.1449 3.35049 14.0491 4.07262 15.3902C4.8112 16.7618 5.70585 17.3755 6.50586 17.3755C7.30587 17.3755 8.20052 16.7618 8.9391 15.3902C9.66123 14.0491 10.1309 12.1449 10.1309 10.0005C10.1309 7.8561 9.66123 5.95191 8.9391 4.61082C8.20052 3.23918 7.30587 2.62549 6.50586 2.62549C5.70585 2.62549 4.8112 3.23918 4.07262 4.61082ZM2.75191 3.89967C3.59678 2.33064 4.88962 1.12549 6.50586 1.12549C8.1221 1.12549 9.41494 2.33064 10.2598 3.89967C11.1211 5.49925 11.6309 7.65756 11.6309 10.0005C11.6309 12.3434 11.1211 14.5017 10.2598 16.1013C9.41494 17.6703 8.1221 18.8755 6.50586 18.8755C4.88962 18.8755 3.59678 17.6703 2.75191 16.1013C1.8906 14.5017 1.38086 12.3434 1.38086 10.0005C1.38086 7.65756 1.8906 5.49925 2.75191 3.89967Z" fill="#262E30"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.8071 5H7.13086C6.09533 5 5.25586 6.84409 5.25586 10C5.25586 13.1559 6.09533 15 7.13086 15H11.8071C11.2267 13.6213 10.8809 11.8857 10.8809 10C10.8809 8.11434 11.2267 6.37871 11.8071 5Z" fill="#D9D9D9"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.0988 4.375H7.13086C6.19757 4.375 5.58064 5.18705 5.22406 6.08611C4.84543 7.04076 4.63086 8.37669 4.63086 10C4.63086 11.6233 4.84543 12.9592 5.22406 13.9139C5.58064 14.813 6.19757 15.625 7.13086 15.625H12.0988C11.9011 15.2423 11.7233 14.8237 11.5686 14.375H7.13086C7.02862 14.375 6.70804 14.265 6.38601 13.453C6.08602 12.6967 5.88086 11.5326 5.88086 10C5.88086 8.46739 6.08602 7.30333 6.38601 6.54696C6.70804 5.73499 7.02862 5.625 7.13086 5.625H11.5686C11.7233 5.1763 11.9011 4.75771 12.0988 4.375Z" fill="#262E30"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.8226 4.61082C12.1005 5.95191 11.6309 7.8561 11.6309 10.0005C11.6309 12.1449 12.1005 14.0491 12.8226 15.3902C13.5612 16.7618 14.4558 17.3755 15.2559 17.3755C16.0559 17.3755 16.9505 16.7618 17.6891 15.3902C18.4112 14.0491 18.8809 12.1449 18.8809 10.0005C18.8809 7.8561 18.4112 5.95191 17.6891 4.61082C16.9505 3.23918 16.0559 2.62549 15.2559 2.62549C14.4558 2.62549 13.5612 3.23918 12.8226 4.61082ZM11.5019 3.89967C12.3468 2.33064 13.6396 1.12549 15.2559 1.12549C16.8721 1.12549 18.1649 2.33064 19.0098 3.89967C19.8711 5.49925 20.3809 7.65756 20.3809 10.0005C20.3809 12.3434 19.8711 14.5017 19.0098 16.1013C18.1649 17.6703 16.8721 18.8755 15.2559 18.8755C13.6396 18.8755 12.3468 17.6703 11.5019 16.1013C10.6406 14.5017 10.1309 12.3434 10.1309 10.0005C10.1309 7.65756 10.6406 5.49925 11.5019 3.89967Z" fill="#262E30"/>
|
||||
<ellipse cx="15.2559" cy="10" rx="1.25" ry="2.5" fill="#D9D9D9" stroke="#262E30" stroke-width="0.6" stroke-linejoin="round"/>
|
||||
</svg>
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><path d="M6.3,17.19c-.38.83-.82,1.31-1.3,1.31-1.38,0-2.5-4.03-2.5-9S3.62.5,5,.5c.49,0,.95.51,1.33,1.38M14,.5c1.38,0,2.5,4.03,2.5,9s-1.12,9-2.5,9-2.5-4.03-2.5-9S12.62.5,14,.5Z" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><path d="M11,17.44c-.51-.54-1.5-3.19-1.5-7.94s.99-7.4,1.5-7.94M9,1.56c-.51.54-1.5,3.19-1.5,7.94s.99,7.4,1.5,7.94M7,1.56c-.51.54-1.5,3.19-1.5,7.94s.99,7.4,1.5,7.94" style="fill:none; stroke:#009688; stroke-linecap:round; stroke-linejoin:round;"/></svg>
|
||||
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 636 B |
|
|
@ -1,7 +1 @@
|
|||
<svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M4.07262 4.61082C3.35049 5.95191 2.88086 7.8561 2.88086 10.0005C2.88086 12.1449 3.35049 14.0491 4.07262 15.3902C4.8112 16.7618 5.70585 17.3755 6.50586 17.3755C7.30587 17.3755 8.20052 16.7618 8.9391 15.3902C9.66123 14.0491 10.1309 12.1449 10.1309 10.0005C10.1309 7.8561 9.66123 5.95191 8.9391 4.61082C8.20052 3.23918 7.30587 2.62549 6.50586 2.62549C5.70585 2.62549 4.8112 3.23918 4.07262 4.61082ZM2.75191 3.89967C3.59678 2.33064 4.88962 1.12549 6.50586 1.12549C8.1221 1.12549 9.41494 2.33064 10.2598 3.89967C11.1211 5.49925 11.6309 7.65756 11.6309 10.0005C11.6309 12.3434 11.1211 14.5017 10.2598 16.1013C9.41494 17.6703 8.1221 18.8755 6.50586 18.8755C4.88962 18.8755 3.59678 17.6703 2.75191 16.1013C1.8906 14.5017 1.38086 12.3434 1.38086 10.0005C1.38086 7.65756 1.8906 5.49925 2.75191 3.89967Z" fill="#262E30"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.8071 5H7.13086C6.09533 5 5.25586 6.84409 5.25586 10C5.25586 13.1559 6.09533 15 7.13086 15H11.8071C11.2267 13.6213 10.8809 11.8857 10.8809 10C10.8809 8.11434 11.2267 6.37871 11.8071 5Z" fill="#D9D9D9"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.0988 4.375H7.13086C6.19757 4.375 5.58064 5.18705 5.22406 6.08611C4.84543 7.04076 4.63086 8.37669 4.63086 10C4.63086 11.6233 4.84543 12.9592 5.22406 13.9139C5.58064 14.813 6.19757 15.625 7.13086 15.625H12.0988C11.9011 15.2423 11.7233 14.8237 11.5686 14.375H7.13086C7.02862 14.375 6.70804 14.265 6.38601 13.453C6.08602 12.6967 5.88086 11.5326 5.88086 10C5.88086 8.46739 6.08602 7.30333 6.38601 6.54696C6.70804 5.73499 7.02862 5.625 7.13086 5.625H11.5686C11.7233 5.1763 11.9011 4.75771 12.0988 4.375Z" fill="#262E30"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.8226 4.61082C12.1005 5.95191 11.6309 7.8561 11.6309 10.0005C11.6309 12.1449 12.1005 14.0491 12.8226 15.3902C13.5612 16.7618 14.4558 17.3755 15.2559 17.3755C16.0559 17.3755 16.9505 16.7618 17.6891 15.3902C18.4112 14.0491 18.8809 12.1449 18.8809 10.0005C18.8809 7.8561 18.4112 5.95191 17.6891 4.61082C16.9505 3.23918 16.0559 2.62549 15.2559 2.62549C14.4558 2.62549 13.5612 3.23918 12.8226 4.61082ZM11.5019 3.89967C12.3468 2.33064 13.6396 1.12549 15.2559 1.12549C16.8721 1.12549 18.1649 2.33064 19.0098 3.89967C19.8711 5.49925 20.3809 7.65756 20.3809 10.0005C20.3809 12.3434 19.8711 14.5017 19.0098 16.1013C18.1649 17.6703 16.8721 18.8755 15.2559 18.8755C13.6396 18.8755 12.3468 17.6703 11.5019 16.1013C10.6406 14.5017 10.1309 12.3434 10.1309 10.0005C10.1309 7.65756 10.6406 5.49925 11.5019 3.89967Z" fill="#262E30"/>
|
||||
<ellipse cx="15.2559" cy="10" rx="1.25" ry="2.5" fill="#D9D9D9" stroke="#262E30" stroke-width="0.6" stroke-linejoin="round"/>
|
||||
</svg>
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><path d="M6.3,17.19c-.38.83-.82,1.31-1.3,1.31-1.38,0-2.5-4.03-2.5-9S3.62.5,5,.5c.49,0,.95.51,1.33,1.38M14,.5c1.38,0,2.5,4.03,2.5,9s-1.12,9-2.5,9-2.5-4.03-2.5-9S12.62.5,14,.5ZM11,1.56c-.51.54-1.5,3.19-1.5,7.94s.99,7.4,1.5,7.94M9,1.56c-.51.54-1.5,3.19-1.5,7.94s.99,7.4,1.5,7.94M7,1.56c-.51.54-1.5,3.19-1.5,7.94s.99,7.4,1.5,7.94" style="fill:none; opacity:.5; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/></svg>
|
||||
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 554 B |
|
|
@ -1,3 +0,0 @@
|
|||
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<circle cx="8" cy="8" r="7.5" fill="#F1F1F1" stroke="#DBDBDB"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 167 B |
|
|
@ -1,3 +0,0 @@
|
|||
<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<circle cx="8.29004" cy="8.23108" r="7.5" stroke="#C2C2C2"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 164 B |
|
|
@ -1,3 +0,0 @@
|
|||
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<circle cx="8" cy="8" r="7.5" fill="#009688" fill-opacity="0.16" stroke="#009688"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 187 B |
|
|
@ -1,4 +0,0 @@
|
|||
<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<rect x="0.290039" y="0.231079" width="16" height="16" rx="8" fill="#009688"/>
|
||||
<circle cx="8.29004" cy="8.23108" r="3" fill="#F7F7F7"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 239 B |
|
|
@ -1,4 +0,0 @@
|
|||
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<rect width="16" height="16" rx="8" fill="#009688"/>
|
||||
<circle cx="8" cy="8" r="3" fill="#F7F7F7"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 201 B |
|
|
@ -1,3 +1 @@
|
|||
<svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M18.8223 0.670677C18.5805 0.604357 18.3102 0.624806 18.0559 0.763978L1.22745 9.97419C0.29897 10.4823 0.417205 11.8517 1.41905 12.1932L5.9217 13.728C6.32217 13.8645 6.75749 13.6505 6.89399 13.25C7.0305 12.8495 6.81651 12.4142 6.41603 12.2777L2.59174 10.9742L15.6966 3.80188L8.1136 12.895C7.72855 13.3567 7.51766 13.9389 7.51766 14.5401V18.5996C7.51766 19.0227 7.86065 19.3657 8.28376 19.3657C8.70686 19.3657 9.04985 19.0227 9.04985 18.5996V14.5401C9.04985 14.2975 9.13495 14.0626 9.29032 13.8763L17.6718 3.82563L15.5515 15.8879L11.0451 14.228C10.6481 14.0818 10.2077 14.2851 10.0615 14.6821C9.91523 15.0791 10.1185 15.5195 10.5156 15.6658L15.3763 17.4562C16.0882 17.7184 16.8638 17.2723 16.9952 16.5251L19.5743 1.85264C19.6457 1.44649 19.4792 1.08673 19.2029 0.865349C19.1918 0.854897 19.1803 0.844711 19.1684 0.834808C19.0651 0.748615 18.9457 0.694265 18.8223 0.670677Z" fill="#262E30"/>
|
||||
</svg>
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><path d="M7.2,12.73l-5.79-1.04c-.33-.07-.42-.5-.13-.69L17.5.5v13.01c0,.52-.46.91-.97.82l-6.44-1.14M17.5.5l-8.08,10.77c-.6.8-.92,1.77-.92,2.77v4.46l3-5" style="fill:none; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><path d="M2.5,16.5l1.54-1.54M.84,15.05l.54-.72M15.65,17.29l.72-.96M6.38,15.33l-1.29,1.73M13.38,16.33l-1.29,1.73" style="fill:none; stroke:#009688; stroke-linecap:round; stroke-linejoin:round;"/></svg>
|
||||
|
Before Width: | Height: | Size: 1 KiB After Width: | Height: | Size: 561 B |
|
|
@ -1,3 +1 @@
|
|||
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M19.1255 0.670677C18.8837 0.604357 18.6134 0.624806 18.3591 0.763978L1.53067 9.97419C0.602193 10.4823 0.720428 11.8517 1.72227 12.1932L6.22492 13.728C6.6254 13.8645 7.06071 13.6505 7.19722 13.25C7.33372 12.8495 7.11973 12.4142 6.71925 12.2777L2.89496 10.9742L15.9998 3.80188L8.41683 12.895C8.03177 13.3567 7.82088 13.9389 7.82088 14.5401V18.5996C7.82088 19.0227 8.16388 19.3657 8.58698 19.3657C9.01008 19.3657 9.35307 19.0227 9.35307 18.5996V14.5401C9.35307 14.2975 9.43817 14.0626 9.59354 13.8763L17.9751 3.82563L15.8547 15.8879L11.3484 14.228C10.9513 14.0818 10.5109 14.2851 10.3647 14.6821C10.2185 15.0791 10.4218 15.5195 10.8188 15.6658L15.6795 17.4562C16.3914 17.7184 17.1671 17.2723 17.2984 16.5251L19.8776 1.85264C19.949 1.44649 19.7824 1.08673 19.5062 0.865349C19.495 0.854897 19.4835 0.844711 19.4717 0.834808C19.3683 0.748615 19.249 0.694265 19.1255 0.670677Z" fill="#CECECE"/>
|
||||
</svg>
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><path d="M7.2,12.73l-5.79-1.04c-.33-.07-.42-.5-.13-.69L17.5.5v13.01c0,.52-.46.91-.97.82l-6.44-1.14M17.5.5l-8.08,10.77c-.6.8-.92,1.77-.92,2.77v4.46l3-5" style="fill:none; opacity:.5; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/><path d="M2.5,16.5l1.54-1.54M.84,15.05l.54-.72M15.65,17.29l.72-.96M6.38,15.33l-1.29,1.73M13.38,16.33l-1.29,1.73" style="fill:none; opacity:.5; stroke:#949494; stroke-linecap:round; stroke-linejoin:round;"/></svg>
|
||||
|
Before Width: | Height: | Size: 1 KiB After Width: | Height: | Size: 585 B |
|
|
@ -7,10 +7,10 @@
|
|||
namespace Slic3r { namespace GUI {
|
||||
|
||||
static const wxColour BgNormalColor = wxColour("#FFFFFF");
|
||||
static const wxColour BgSelectColor = wxColour("#EBF9F0");
|
||||
static const wxColour BgSelectColor = wxColour("#E5F0EE"); // ORCA
|
||||
|
||||
static const wxColour TextNormalColor = wxColour("#000000");
|
||||
static const wxColour TextSelectColor = wxColour("#009688");
|
||||
static const wxColour TextNormalColor = wxColour("#262E30");
|
||||
static const wxColour TextSelectColor = wxColour("#262E30"); // ORCA use same color on selected to improve readability
|
||||
|
||||
static const wxColour BorderNormalColor = wxColour("#CECECE");
|
||||
static const wxColour BorderSelectColor = wxColour("#009688");
|
||||
|
|
|
|||
|
|
@ -49,11 +49,11 @@ static void set_prefered_map_mode(FilamentMapMode mode)
|
|||
|
||||
void FilamentGroupPopup::CreateBmps()
|
||||
{
|
||||
checked_bmp = create_scaled_bitmap("map_mode_on", nullptr, 16);;
|
||||
unchecked_bmp = create_scaled_bitmap("map_mode_off", nullptr, 16);
|
||||
disabled_bmp = create_scaled_bitmap("map_mode_disabled", nullptr, 16);
|
||||
checked_hover_bmp = create_scaled_bitmap("map_mode_on_hovered", nullptr, 16);
|
||||
unchecked_hover_bmp = create_scaled_bitmap("map_mode_off_hovered", nullptr, 16);
|
||||
checked_bmp = create_scaled_bitmap("radio_on", nullptr, 16);; // ORCA match icons
|
||||
unchecked_bmp = create_scaled_bitmap("radio_off", nullptr, 16);
|
||||
disabled_bmp = create_scaled_bitmap("radio_disabled", nullptr, 16);
|
||||
checked_hover_bmp = create_scaled_bitmap("radio_on_hover", nullptr, 16);
|
||||
unchecked_hover_bmp = create_scaled_bitmap("radio_off_hover", nullptr, 16);
|
||||
}
|
||||
|
||||
FilamentGroupPopup::FilamentGroupPopup(wxWindow *parent) : PopupWindow(parent, wxBORDER_NONE | wxPU_CONTAINS_CONTROLS)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
#include "FilamentMapDialog.hpp"
|
||||
#include "PartPlate.hpp"
|
||||
#include "Widgets/Button.hpp"
|
||||
#include "Widgets/DialogButtons.hpp"
|
||||
#include "I18N.hpp"
|
||||
#include "GUI_App.hpp"
|
||||
#include "CapsuleButton.hpp"
|
||||
|
|
@ -110,23 +111,6 @@ bool try_pop_up_before_slice(bool is_slice_all, Plater* plater_ref, PartPlate* p
|
|||
return false;
|
||||
}
|
||||
|
||||
|
||||
static const StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
|
||||
std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
|
||||
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
|
||||
|
||||
static const StateColor btn_bd_green(std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
|
||||
|
||||
static const StateColor btn_text_green(std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Normal));
|
||||
|
||||
static const StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed),
|
||||
std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered),
|
||||
std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Normal));
|
||||
|
||||
static const StateColor btn_bd_white(std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Normal));
|
||||
|
||||
static const StateColor btn_text_white(std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Normal));
|
||||
|
||||
FilamentMapDialog::FilamentMapDialog(wxWindow *parent,
|
||||
const std::vector<std::string> &filament_color,
|
||||
const std::vector<std::string> &filament_type,
|
||||
|
|
@ -213,25 +197,11 @@ FilamentMapDialog::FilamentMapDialog(wxWindow *parent,
|
|||
bottom_sizer->AddStretchSpacer();
|
||||
|
||||
{
|
||||
wxBoxSizer *button_sizer = new wxBoxSizer(wxHORIZONTAL);
|
||||
m_ok_btn = new Button(bottom_panel, _L("OK"));
|
||||
m_cancel_btn = new Button(bottom_panel, _L("Cancel"));
|
||||
m_ok_btn->SetCornerRadius(FromDIP(12));
|
||||
m_cancel_btn->SetCornerRadius(FromDIP(12));
|
||||
m_ok_btn->SetFont(Label::Body_12);
|
||||
m_cancel_btn->SetFont(Label::Body_12);
|
||||
auto dlg_btns = new DialogButtons(bottom_panel, {"OK", "Cancel"});
|
||||
m_ok_btn = dlg_btns->GetOK();
|
||||
m_cancel_btn = dlg_btns->GetCANCEL();
|
||||
|
||||
m_ok_btn->SetBackgroundColor(btn_bg_green);
|
||||
m_ok_btn->SetBorderColor(btn_bd_green);
|
||||
m_ok_btn->SetTextColor(btn_text_green);
|
||||
m_cancel_btn->SetBackgroundColor(btn_bg_white);
|
||||
m_cancel_btn->SetBorderColor(btn_bd_white);
|
||||
m_cancel_btn->SetTextColor(btn_text_white);
|
||||
|
||||
button_sizer->Add(m_ok_btn, 1, wxRIGHT, FromDIP(4));
|
||||
button_sizer->Add(m_cancel_btn, 1, wxLEFT, FromDIP(4));
|
||||
|
||||
bottom_sizer->Add(button_sizer, 0, wxALIGN_CENTER | wxALL, FromDIP(15));
|
||||
bottom_sizer->Add(dlg_btns, 0, wxEXPAND);
|
||||
}
|
||||
main_sizer->Add(bottom_panel, 0, wxEXPAND);
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
namespace Slic3r { namespace GUI {
|
||||
|
||||
static const wxColour BgNormalColor = wxColour("#FFFFFF");
|
||||
static const wxColour BgSelectColor = wxColour("#EBF9F0");
|
||||
static const wxColour BgSelectColor = wxColour("#E5F0EE"); // ORCA
|
||||
static const wxColour BgDisableColor = wxColour("#CECECE");
|
||||
|
||||
static const wxColour BorderNormalColor = wxColour("#CECECE");
|
||||
|
|
|
|||
|
|
@ -4491,7 +4491,7 @@ void GCodeViewer::render_legend_color_arr_recommen(float window_padding)
|
|||
ImVec2 p1 = ImGui::GetCursorScreenPos();
|
||||
ImVec2 p2 = ImVec2(p1.x + ImGui::GetContentRegionAvail().x, p1.y);
|
||||
for (float i = p1.x; i < p2.x; i += (dash_length + gap_length)) {
|
||||
draw_list->AddLine(ImVec2(i, p1.y), ImVec2(i + dash_length, p1.y), IM_COL32(206, 206, 206, 255));
|
||||
draw_list->AddLine(ImVec2(i, p1.y), ImVec2(i + dash_length, p1.y), ImGui::GetColorU32(ImVec4(1.0f,1.0f,1.0f,0.6f))); // ORCA match color
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -4558,8 +4558,8 @@ void GCodeViewer::render_legend_color_arr_recommen(float window_padding)
|
|||
tips_count = 5;
|
||||
|
||||
float AMS_container_height = ams_item_height + line_height * tips_count + line_height;
|
||||
ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.f, 1.f, 1.f, 1.0f));
|
||||
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(.15f, .18f, .19f, 1.0f));
|
||||
ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(0, 0, 0, 0)); // this shold be 0 since its child of gcodeviewer
|
||||
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1, 1, 1, 1));
|
||||
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(window_padding * 3, 0));
|
||||
|
||||
// ImGui::Dummy({window_padding, window_padding});
|
||||
|
|
@ -4570,7 +4570,7 @@ void GCodeViewer::render_legend_color_arr_recommen(float window_padding)
|
|||
float spacing = 18.0f * m_scale;
|
||||
|
||||
ImGui::Dummy({window_padding, window_padding});
|
||||
ImGui::PushStyleColor(ImGuiCol_Separator, ImVec4(.8f, .8f, .8f, 1.0f));
|
||||
ImGui::PushStyleColor(ImGuiCol_Separator, ImVec4(1.0f,1.0f,1.0f,0.6f));
|
||||
imgui.bold_text(_u8L("Filament Grouping"));
|
||||
ImGui::SameLine();
|
||||
std::string tip_str = _u8L("Why this grouping");
|
||||
|
|
@ -4580,12 +4580,12 @@ void GCodeViewer::render_legend_color_arr_recommen(float window_padding)
|
|||
ImGui::PopStyleColor();
|
||||
ImGui::Dummy({window_padding, window_padding});
|
||||
|
||||
ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(0.00f, 0.00f, 0.00f, 0.1f));
|
||||
ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1, 1, 1, 0.05f));
|
||||
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(window_padding * 2, window_padding));
|
||||
|
||||
ImDrawList *child_begin_draw_list = ImGui::GetWindowDrawList();
|
||||
ImVec2 cursor_pos = ImGui::GetCursorScreenPos();
|
||||
child_begin_draw_list->AddRectFilled(cursor_pos, ImVec2(cursor_pos.x + half_width, cursor_pos.y + line_height), IM_COL32(0, 0, 0, 20));
|
||||
child_begin_draw_list->AddRectFilled(cursor_pos, ImVec2(cursor_pos.x + half_width, cursor_pos.y + line_height), IM_COL32(255, 255, 255, 10));
|
||||
ImGui::BeginChild("#LeftAMS", ImVec2(half_width, ams_item_height), false, ImGuiWindowFlags_AlwaysUseWindowPadding);
|
||||
{
|
||||
imgui.text(_u8L("Left nozzle"));
|
||||
|
|
@ -4600,7 +4600,7 @@ void GCodeViewer::render_legend_color_arr_recommen(float window_padding)
|
|||
}
|
||||
ImGui::SameLine();
|
||||
cursor_pos = ImGui::GetCursorScreenPos();
|
||||
child_begin_draw_list->AddRectFilled(cursor_pos, ImVec2(cursor_pos.x + half_width, cursor_pos.y + line_height), IM_COL32(0, 0, 0, 20));
|
||||
child_begin_draw_list->AddRectFilled(cursor_pos, ImVec2(cursor_pos.x + half_width, cursor_pos.y + line_height), IM_COL32(255, 255, 255, 10));
|
||||
ImGui::BeginChild("#RightAMS", ImVec2(half_width, ams_item_height), false, ImGuiWindowFlags_AlwaysUseWindowPadding);
|
||||
{
|
||||
imgui.text(_u8L("Right nozzle"));
|
||||
|
|
@ -6075,7 +6075,7 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv
|
|||
append_option_item(item, offsets);
|
||||
}
|
||||
ImGui::Dummy({ window_padding, window_padding });
|
||||
if (m_nozzle_nums > 1)
|
||||
if (m_nozzle_nums > 1 && (m_view_type == EViewType::Summary || m_view_type == EViewType::ColorPrint)) // ORCA show only on summary and filament tab
|
||||
render_legend_color_arr_recommen(window_padding);
|
||||
|
||||
legend_height = ImGui::GetCurrentWindow()->Size.y;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue