FIX: fix plater UI
Jira: 10520 Change-Id: Iec4401862d1c28df45067dc9b545dafe1341eb35
This commit is contained in:
Mixian
lane.wei
parent
ccf58b3fc6
commit
94ceedf97f
|
|
@ -1,6 +1,12 @@
|
|||
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M7.87009 2.23001C6.33009 0.690012 3.83009 0.690012 2.28009 2.23001C0.730091 3.77001 0.740091 6.27001 2.28009 7.82001C3.71009 9.25001 5.97009 9.35001 7.52009 8.13001L8.85009 9.46001C8.85009 9.46001 8.52009 9.79001 8.85009 10.12C9.18009 10.45 12.1401 13.41 12.1401 13.41C12.1401 13.41 12.4701 13.74 12.8001 13.41C13.1301 13.08 13.4601 12.75 13.4601 12.75C13.4601 12.75 13.7901 12.42 13.4601 12.09C13.1301 11.76 10.1701 8.80001 10.1701 8.80001C9.84009 8.47001 9.51009 8.80001 9.51009 8.80001L8.18009 7.47001C9.41009 5.92001 9.30009 3.67001 7.87009 2.23001ZM7.52009 7.47001C6.17009 8.82001 3.98009 8.82001 2.63009 7.47001C1.28009 6.12001 1.28009 3.93001 2.63009 2.58001C3.98009 1.23001 6.17009 1.23001 7.52009 2.58001C8.87009 3.93001 8.87009 6.12001 7.52009 7.47001Z" fill="#73CA94"/>
|
||||
<path d="M7.49016 4.34999C7.43016 4.15999 7.36016 3.96999 7.26016 3.79999L7.44016 3.25999L6.85016 2.66999L6.31016 2.84999C6.14016 2.74999 5.95016 2.67999 5.75016 2.61999L5.50016 2.10999H4.66016L4.41016 2.61999C4.21016 2.66999 4.03016 2.74999 3.85016 2.84999L3.31016 2.66999L2.72016 3.25999L2.90016 3.79999C2.80016 3.96999 2.72016 4.15999 2.67016 4.34999L2.16016 4.60999V5.43999L2.67016 5.69999C2.72016 5.89999 2.80016 6.07999 2.90016 6.25999L2.72016 6.79999L3.31016 7.38999L3.85016 7.20999C4.02016 7.30999 4.21016 7.37999 4.41016 7.43999L4.67016 7.94999H5.50016L5.76016 7.43999C5.96016 7.38999 6.14016 7.30999 6.32016 7.20999L6.86016 7.38999L7.44016 6.79999L7.26016 6.25999C7.36016 6.07999 7.43016 5.89999 7.49016 5.69999L8.00016 5.44999V4.60999L7.49016 4.34999ZM5.08016 6.32999C4.36016 6.32999 3.78016 5.74999 3.78016 5.02999C3.78016 4.30999 4.36016 3.72999 5.08016 3.72999C5.80016 3.72999 6.38016 4.30999 6.38016 5.02999C6.38016 5.74999 5.80016 6.32999 5.08016 6.32999Z" fill="#73CA94"/>
|
||||
<path d="M14.56 4.45001C14.51 4.28001 14.45 4.12001 14.36 3.97001L14.51 3.51001L14 3.00001L13.54 3.15001C13.39 3.07001 13.23 3.00001 13.06 2.95001L12.84 2.51001H12.13L11.91 2.95001C11.74 3.00001 11.58 3.06001 11.43 3.15001L10.97 3.00001L10.46 3.51001L10.61 3.97001C10.53 4.12001 10.46 4.28001 10.41 4.45001L10 4.67001V5.38001L10.44 5.60001C10.49 5.77001 10.55 5.93001 10.64 6.08001L10.49 6.54001L11 7.05001L11.46 6.90001C11.61 6.98001 11.77 7.05001 11.94 7.10001L12.16 7.54001H12.87L13.09 7.10001C13.26 7.05001 13.42 6.99001 13.57 6.90001L14.03 7.05001L14.54 6.54001L14.39 6.08001C14.47 5.93001 14.54 5.77001 14.59 5.60001L15 5.39001V4.67001L14.56 4.45001ZM12.5 6.14001C11.88 6.14001 11.39 5.64001 11.39 5.03001C11.39 4.41001 11.89 3.92001 12.5 3.92001C13.11 3.92001 13.61 4.42001 13.61 5.03001C13.61 5.64001 13.11 6.14001 12.5 6.14001Z" fill="#73CA94"/>
|
||||
<path d="M7.14006 11.91C7.09006 11.74 7.03006 11.58 6.94006 11.43L7.09006 10.97L6.58006 10.46L6.12006 10.61C5.97006 10.53 5.81006 10.46 5.64006 10.41L5.44006 9.98999H4.72006L4.50006 10.43C4.33006 10.48 4.17006 10.54 4.02006 10.63L3.56006 10.48L3.05006 10.99L3.20006 11.45C3.12006 11.6 3.05006 11.76 3.00006 11.93L2.56006 12.15V12.86L3.00006 13.08C3.05006 13.25 3.11006 13.41 3.20006 13.56L3.06006 14L3.57006 14.51L4.03006 14.36C4.18006 14.44 4.34006 14.51 4.51006 14.56L4.73006 15H5.44006L5.66006 14.56C5.83006 14.51 5.99006 14.45 6.14006 14.36L6.60006 14.51L7.10006 14L6.95006 13.54C7.03006 13.39 7.10006 13.23 7.15006 13.06L7.59006 12.84V12.13L7.14006 11.91ZM5.08006 13.6C4.46006 13.6 3.97006 13.1 3.97006 12.49C3.97006 11.87 4.47006 11.38 5.08006 11.38C5.69006 11.38 6.19006 11.88 6.19006 12.49C6.19006 13.11 5.69006 13.6 5.08006 13.6Z" fill="#73CA94"/>
|
||||
<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g clip-path="url(#clip0_21527_27813)">
|
||||
<path d="M4.27435 0.785247C4.0666 0.57746 3.72976 0.577441 3.52199 0.785205C3.31423 0.992968 3.31421 1.32984 3.52195 1.53762L5.19326 3.20926L1.05787 3.20926C0.764061 3.20926 0.525879 3.44747 0.525879 3.7413C0.525879 4.03514 0.764061 4.27335 1.05787 4.27335L5.19344 4.27334L3.52197 5.94496C3.31422 6.15273 3.31422 6.4896 3.52197 6.69738C3.72973 6.90515 4.06657 6.90515 4.27433 6.69738L6.76531 4.20617C7.02194 3.94952 7.02196 3.53341 6.76534 3.27674L4.27435 0.785247Z" fill="#262E30"/>
|
||||
<path d="M11.8618 2.13784C12.0695 2.34561 12.0695 2.68248 11.8618 2.89026L2.89024 11.8623C2.68248 12.07 2.34564 12.07 2.13789 11.8623C1.93014 11.6545 1.93014 11.3176 2.1379 11.1098L11.1094 2.13782C11.3172 1.93005 11.654 1.93006 11.8618 2.13784Z" fill="#262E30"/>
|
||||
<path d="M13.4742 10.2588C13.4742 10.5526 13.236 10.7908 12.9422 10.7908H8.80682L10.4781 12.4625C10.6859 12.6703 10.6859 13.0071 10.4781 13.2149C10.2703 13.4227 9.93348 13.4226 9.72573 13.2148L7.23474 10.7234C6.97812 10.4667 6.97813 10.0506 7.23477 9.79392L9.72575 7.30271C9.93351 7.09494 10.2704 7.09494 10.4781 7.30271C10.6859 7.51049 10.6859 7.84736 10.4781 8.05513L8.80664 9.72675H12.9422C13.236 9.72675 13.4742 9.96495 13.4742 10.2588Z" fill="#262E30"/>
|
||||
</g>
|
||||
<defs>
|
||||
<clipPath id="clip0_21527_27813">
|
||||
<rect width="14" height="14" fill="white"/>
|
||||
</clipPath>
|
||||
</defs>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 1.4 KiB |
|
|
@ -1,10 +1,10 @@
|
|||
<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g clip-path="url(#clip0_16585_40433)">
|
||||
<path d="M7.21631 13.8672C8.84076 13.8672 10.3987 13.2219 11.5473 12.0732C12.696 10.9246 13.3413 9.36664 13.3413 7.74219C13.3413 6.11774 12.696 4.55982 11.5473 3.41116C10.3987 2.2625 8.84076 1.61719 7.21631 1.61719C5.59186 1.61719 4.03394 2.2625 2.88528 3.41116C1.73662 4.55982 1.09131 6.11774 1.09131 7.74219C1.09131 9.36664 1.73662 10.9246 2.88528 12.0732C4.03394 13.2219 5.59186 13.8672 7.21631 13.8672ZM7.21631 0.742188C9.07282 0.742188 10.8533 1.47969 12.1661 2.79244C13.4788 4.10519 14.2163 5.88567 14.2163 7.74219C14.2163 9.5987 13.4788 11.3792 12.1661 12.6919C10.8533 14.0047 9.07282 14.7422 7.21631 14.7422C5.35979 14.7422 3.57932 14.0047 2.26656 12.6919C0.953807 11.3792 0.216309 9.5987 0.216309 7.74219C0.216309 5.88567 0.953807 4.10519 2.26656 2.79244C3.57932 1.47969 5.35979 0.742188 7.21631 0.742188ZM7.87256 7.74219C7.87256 7.91624 7.80342 8.08316 7.68035 8.20623C7.55728 8.3293 7.39036 8.39844 7.21631 8.39844C7.04226 8.39844 6.87534 8.3293 6.75227 8.20623C6.6292 8.08316 6.56006 7.91624 6.56006 7.74219C6.56006 7.56814 6.6292 7.40122 6.75227 7.27815C6.87534 7.15508 7.04226 7.08594 7.21631 7.08594C7.39036 7.08594 7.55728 7.15508 7.68035 7.27815C7.80342 7.40122 7.87256 7.56814 7.87256 7.74219ZM9.84131 7.08594C10.0154 7.08594 10.1823 7.15508 10.3053 7.27815C10.4284 7.40122 10.4976 7.56814 10.4976 7.74219C10.4976 7.91624 10.4284 8.08316 10.3053 8.20623C10.1823 8.3293 10.0154 8.39844 9.84131 8.39844C9.66726 8.39844 9.50034 8.3293 9.37727 8.20623C9.2542 8.08316 9.18506 7.91624 9.18506 7.74219C9.18506 7.56814 9.2542 7.40122 9.37727 7.27815C9.50034 7.15508 9.66726 7.08594 9.84131 7.08594ZM5.24756 7.74219C5.24756 7.91624 5.17842 8.08316 5.05535 8.20623C4.93228 8.3293 4.76536 8.39844 4.59131 8.39844C4.41726 8.39844 4.25034 8.3293 4.12727 8.20623C4.0042 8.08316 3.93506 7.91624 3.93506 7.74219C3.93506 7.56814 4.0042 7.40122 4.12727 7.27815C4.25034 7.15508 4.41726 7.08594 4.59131 7.08594C4.76536 7.08594 4.93228 7.15508 5.05535 7.27815C5.17842 7.40122 5.24756 7.56814 5.24756 7.74219Z" fill="#6B6B6B"/>
|
||||
<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g clip-path="url(#clip0_21527_27811)">
|
||||
<path d="M6.99988 12.2021C8.37959 12.2021 9.70279 11.654 10.6784 10.6784C11.654 9.70279 12.2021 8.37959 12.2021 6.99988C12.2021 5.62017 11.654 4.29697 10.6784 3.32137C9.70279 2.34576 8.37959 1.79768 6.99988 1.79768C5.62017 1.79768 4.29697 2.34576 3.32137 3.32137C2.34576 4.29697 1.79768 5.62017 1.79768 6.99988C1.79768 8.37959 2.34576 9.70279 3.32137 10.6784C4.29697 11.654 5.62017 12.2021 6.99988 12.2021ZM6.99988 0.597168C8.69798 0.597168 10.3265 1.27174 11.5273 2.47248C12.728 3.67322 13.4026 5.30177 13.4026 6.99988C13.4026 8.69798 12.728 10.3265 11.5273 11.5273C10.3265 12.728 8.69798 13.4026 6.99988 13.4026C5.30177 13.4026 3.67322 12.728 2.47248 11.5273C1.27174 10.3265 0.597168 8.69798 0.597168 6.99988C0.597168 5.30177 1.27174 3.67322 2.47248 2.47248C3.67322 1.27174 5.30177 0.597168 6.99988 0.597168ZM7.80022 6.99988C7.80022 7.21214 7.7159 7.41571 7.5658 7.5658C7.41571 7.7159 7.21214 7.80022 6.99988 7.80022C6.78761 7.80022 6.58405 7.7159 6.43395 7.5658C6.28386 7.41571 6.19954 7.21214 6.19954 6.99988C6.19954 6.78761 6.28386 6.58405 6.43395 6.43395C6.58405 6.28386 6.78761 6.19954 6.99988 6.19954C7.21214 6.19954 7.41571 6.28386 7.5658 6.43395C7.7159 6.58405 7.80022 6.78761 7.80022 6.99988ZM9.40089 6.19954C9.61316 6.19954 9.81673 6.28386 9.96682 6.43395C10.1169 6.58405 10.2012 6.78761 10.2012 6.99988C10.2012 7.21214 10.1169 7.41571 9.96682 7.5658C9.81673 7.7159 9.61316 7.80022 9.40089 7.80022C9.18863 7.80022 8.98506 7.7159 8.83497 7.5658C8.68488 7.41571 8.60056 7.21214 8.60056 6.99988C8.60056 6.78761 8.68488 6.58405 8.83497 6.43395C8.98506 6.28386 9.18863 6.19954 9.40089 6.19954ZM5.3992 6.99988C5.3992 7.21214 5.31488 7.41571 5.16479 7.5658C5.01469 7.7159 4.81112 7.80022 4.59886 7.80022C4.3866 7.80022 4.18303 7.7159 4.03294 7.5658C3.88284 7.41571 3.79852 7.21214 3.79852 6.99988C3.79852 6.78761 3.88284 6.58405 4.03294 6.43395C4.18303 6.28386 4.3866 6.19954 4.59886 6.19954C4.81112 6.19954 5.01469 6.28386 5.16479 6.43395C5.31488 6.58405 5.3992 6.78761 5.3992 6.99988Z" fill="#262E30"/>
|
||||
</g>
|
||||
<defs>
|
||||
<clipPath id="clip0_16585_40433">
|
||||
<rect width="14" height="14" fill="white" transform="translate(0.216309 0.742188)"/>
|
||||
<clipPath id="clip0_21527_27811">
|
||||
<rect width="14" height="14" fill="white"/>
|
||||
</clipPath>
|
||||
</defs>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.2 KiB |
|
|
@ -1,3 +1,15 @@
|
|||
<svg width="13" height="13" viewBox="0 0 13 13" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.64416 0.0460923C9.40312 0.325341 10.1279 0.743368 10.7596 1.35304L10.7642 1.35751L10.7687 1.36213C10.8511 1.44734 10.9164 1.55445 10.9509 1.67142C10.9823 1.77755 10.996 1.92131 10.9375 2.0651C10.7651 2.61567 10.837 3.19845 11.1199 3.67232L11.1228 3.67711L11.1255 3.68198C11.4205 4.2112 11.8449 4.53241 12.3618 4.63795L12.3875 4.6432L12.4123 4.65199C12.6234 4.72701 12.8514 4.91193 12.8727 5.22281C12.9609 5.639 13 6.09568 13 6.50084C13 6.92104 12.958 7.34344 12.8672 7.80414L12.8629 7.82587L12.8561 7.84695C12.7827 8.07459 12.6342 8.23892 12.4589 8.32951L12.4236 8.34771L12.3854 8.35813C11.8277 8.51021 11.3726 8.84627 11.1305 9.3105L11.1265 9.31816C10.8427 9.83312 10.8004 10.3923 10.948 10.9706C11.0071 11.1822 10.9835 11.5124 10.721 11.6832C10.0936 12.2317 9.38676 12.6382 8.64669 12.9541L8.62946 12.9615L8.61158 12.9671C8.48719 13.0061 8.35108 13.0152 8.21343 12.9683C8.08498 12.9245 7.99347 12.8444 7.93183 12.7806C7.51695 12.3518 7.0117 12.103 6.5 12.103C5.96365 12.103 5.43607 12.3254 5.091 12.7548L5.08018 12.7682L5.06817 12.7806C4.96422 12.8881 4.78806 12.9842 4.58673 12.9842H4.43411L4.37191 12.9615C3.60711 12.6823 2.87655 12.2626 2.2404 11.6487L2.23577 11.6442L2.2313 11.6396C2.14884 11.5544 2.08363 11.4472 2.04905 11.3303C2.01768 11.2241 2.00395 11.0804 2.06252 10.9366C2.23489 10.386 2.16298 9.80326 1.88009 9.32939L1.87723 9.3246L1.87452 9.31972C1.57951 8.79051 1.15512 8.46929 0.638174 8.36375L0.612457 8.3585L0.58772 8.34971C0.376138 8.27454 0.147616 8.08898 0.127195 7.77688C0.0433791 7.36455 0 6.9089 0 6.50084C0 6.08065 0.0420384 5.65826 0.132834 5.19757L0.137117 5.17584L0.143914 5.15476C0.217328 4.92712 0.365835 4.76279 0.541142 4.67219L0.576355 4.654L0.614581 4.64357C1.17233 4.49149 1.62745 4.15544 1.86954 3.69121L1.87353 3.68355C2.15729 3.16859 2.19956 2.60937 2.05203 2.03103C1.99286 1.81951 2.01654 1.4893 2.27903 1.31854C2.90641 0.769966 3.61324 0.363512 4.35331 0.0475626L4.37054 0.0402054L4.38842 0.0346057C4.51284 -0.00436136 4.64896 -0.0134671 4.78662 0.0334788C4.91505 0.0772809 5.00655 0.157395 5.06817 0.22109C5.48304 0.649892 5.98828 0.898648 6.5 0.898648C7.03637 0.898648 7.56394 0.676268 7.909 0.246965L7.91982 0.233502L7.93183 0.22109C8.01418 0.135973 8.11971 0.0665624 8.23767 0.0293017C8.34642 -0.00504887 8.49594 -0.0200747 8.64416 0.0460923ZM8.44671 0.775142C9.08832 1.019 9.6888 1.37146 10.2125 1.8694C9.98878 2.61261 10.0869 3.40363 10.4732 4.05382C10.8484 4.72418 11.4168 5.18803 12.1341 5.35791C12.2128 5.71911 12.2497 6.13128 12.2497 6.50084C12.2497 6.86027 12.2147 7.22536 12.1364 7.6307C12.1325 7.63967 12.1287 7.64589 12.1257 7.65005C11.4296 7.8554 10.8127 8.29912 10.4675 8.9581C10.0843 9.65592 10.0354 10.4047 10.2138 11.1284C9.68572 11.5872 9.08576 11.9407 8.43889 12.2247C7.92258 11.7046 7.24591 11.3508 6.5 11.3508C5.78582 11.3508 5.056 11.638 4.5533 12.2266C3.91168 11.9827 3.3112 11.6302 2.7875 11.1323C3.01123 10.3891 2.91311 9.59808 2.5268 8.94789C2.15166 8.27756 1.58327 7.81372 0.865944 7.64382C0.790394 7.2791 0.750341 6.86669 0.750341 6.50084C0.750341 6.14142 0.785275 5.77634 0.863554 5.37101C0.867456 5.36204 0.871274 5.35582 0.874281 5.35166C1.57035 5.14631 2.18732 4.70259 2.53247 4.04361C2.91568 3.3458 2.9646 2.59701 2.78617 1.87332C3.31428 1.41452 3.91423 1.061 4.56109 0.777009C5.07742 1.29713 5.7541 1.65092 6.5 1.65092C7.21417 1.65092 7.944 1.36371 8.44671 0.775142ZM2.77376 1.82504C2.7737 1.82457 2.77377 1.82505 2.77376 1.82504V1.82504ZM6.50786 4.81418C5.62226 4.81418 4.88725 5.56022 4.88725 6.50084C4.88725 7.44455 5.62525 8.18753 6.50786 8.18753C7.38865 8.18753 8.12488 7.44223 8.12846 6.50017C8.12811 5.55629 7.39372 4.81418 6.50786 4.81418ZM4.13691 6.50084C4.13691 5.1675 5.18553 4.06191 6.50786 4.06191C7.82971 4.06191 8.8788 5.16295 8.8788 6.50084L8.8788 6.50214C8.8742 7.83375 7.82694 8.93979 6.50786 8.93979C5.1904 8.93979 4.13691 7.83922 4.13691 6.50084Z" fill="#323A3D"/>
|
||||
<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g clip-path="url(#clip0_21527_27806)">
|
||||
<g clip-path="url(#clip1_21527_27806)">
|
||||
<path d="M6.99994 0.5C7.43158 0.5 7.85306 0.543164 8.26439 0.621875C8.46498 0.659961 8.81791 0.776758 9.01087 1.13223C9.06166 1.22617 9.10228 1.3252 9.12767 1.43184L9.3638 2.40937C9.39935 2.55664 9.64818 2.70137 9.79291 2.6582L10.7577 2.37383C10.8593 2.34336 10.9634 2.32813 11.0675 2.32559C11.4763 2.31289 11.7531 2.56426 11.8876 2.7166C12.4488 3.35391 12.8804 4.10293 13.1546 4.90781C13.2206 5.10078 13.2968 5.46133 13.0861 5.80664C13.0302 5.89805 12.9617 5.98438 12.8829 6.06055L12.1542 6.75371C12.0476 6.85527 12.0476 7.14727 12.1542 7.24883L12.8829 7.94199C12.9617 8.01816 13.0302 8.10449 13.0861 8.1959C13.2943 8.54121 13.2181 8.90176 13.1546 9.09473C12.8804 9.89961 12.4488 10.6461 11.8876 11.2859C11.7531 11.4383 11.4738 11.6896 11.0675 11.677C10.9634 11.6744 10.8593 11.6566 10.7577 11.6287L9.79291 11.3418C9.64818 11.2986 9.39935 11.4434 9.3638 11.5906L9.12767 12.5682C9.10228 12.6748 9.06166 12.7764 9.01087 12.8678C8.81537 13.2232 8.46244 13.3375 8.26439 13.3781C7.85306 13.4568 7.43158 13.5 6.99994 13.5C6.5683 13.5 6.14681 13.4568 5.73548 13.3781C5.5349 13.34 5.18197 13.2232 4.989 12.8678C4.93822 12.7738 4.89759 12.6748 4.8722 12.5682L4.63607 11.5906C4.60052 11.4434 4.3517 11.2986 4.20697 11.3418L3.24212 11.6262C3.14056 11.6566 3.03646 11.6719 2.93236 11.6744C2.52357 11.6871 2.24681 11.4357 2.11224 11.2834C1.55365 10.6461 1.11947 9.89707 0.84525 9.09219C0.779234 8.89922 0.703062 8.53867 0.913805 8.19336C0.969664 8.10195 1.03822 8.01562 1.11693 7.93945L1.84564 7.24629C1.95228 7.14473 1.95228 6.85273 1.84564 6.75117L1.11439 6.05801C1.03568 5.98184 0.967125 5.89551 0.911266 5.8041C0.703062 5.45879 0.779234 5.09824 0.84525 4.90781C1.11947 4.10293 1.55111 3.35645 2.11224 2.7166C2.24681 2.56426 2.52611 2.31289 2.93236 2.32559C3.03646 2.32813 3.14056 2.3459 3.24212 2.37383L4.20697 2.6582C4.3517 2.70137 4.60052 2.55664 4.63607 2.40937L4.8722 1.43184C4.89759 1.3252 4.93822 1.22363 4.989 1.13223C5.18451 0.776758 5.53744 0.6625 5.73548 0.621875C6.14681 0.543164 6.5683 0.5 6.99994 0.5ZM6.03763 1.80508L5.82181 2.69629C5.62377 3.51641 4.67162 4.06484 3.86166 3.82871L2.98568 3.56973C2.56673 4.05977 2.23666 4.62852 2.02084 5.23789L2.68607 5.87012C3.29545 6.44902 3.29545 7.55098 2.68607 8.12988L2.02084 8.76211C2.23666 9.37148 2.56673 9.94023 2.98568 10.4303L3.8642 10.1713C4.67162 9.93262 5.6263 10.4836 5.82435 11.3037L6.04017 12.1949C6.66478 12.3092 7.34271 12.3092 7.96732 12.1949L8.18314 11.3037C8.38119 10.4836 9.33334 9.93516 10.1433 10.1713L11.0218 10.4303C11.4408 9.94023 11.7708 9.37148 11.9867 8.76211L11.3214 8.12988C10.712 7.55098 10.712 6.44902 11.3214 5.87012L11.9867 5.23789C11.7708 4.62852 11.4408 4.05977 11.0218 3.56973L10.1433 3.82871C9.33587 4.06738 8.38119 3.51641 8.18314 2.69629L7.96732 1.80508C7.34271 1.69082 6.66478 1.69082 6.04017 1.80508H6.03763ZM5.78119 7C5.78119 7.32323 5.90959 7.63323 6.13815 7.86179C6.36671 8.09035 6.6767 8.21875 6.99994 8.21875C7.32317 8.21875 7.63316 8.09035 7.86172 7.86179C8.09028 7.63323 8.21869 7.32323 8.21869 7C8.21869 6.67677 8.09028 6.36677 7.86172 6.13821C7.63316 5.90965 7.32317 5.78125 6.99994 5.78125C6.6767 5.78125 6.36671 5.90965 6.13815 6.13821C5.90959 6.36677 5.78119 6.67677 5.78119 7ZM6.99994 9.4375C6.35347 9.4375 5.73348 9.18069 5.27636 8.72357C4.81924 8.26645 4.56244 7.64647 4.56244 7C4.56244 6.35353 4.81924 5.73355 5.27636 5.27643C5.73348 4.81931 6.35347 4.5625 6.99994 4.5625C7.6464 4.5625 8.26639 4.81931 8.72351 5.27643C9.18063 5.73355 9.43744 6.35353 9.43744 7C9.43744 7.64647 9.18063 8.26645 8.72351 8.72357C8.26639 9.18069 7.6464 9.4375 6.99994 9.4375Z" fill="#262E30"/>
|
||||
</g>
|
||||
</g>
|
||||
<defs>
|
||||
<clipPath id="clip0_21527_27806">
|
||||
<rect width="14" height="14" fill="white"/>
|
||||
</clipPath>
|
||||
<clipPath id="clip1_21527_27806">
|
||||
<rect width="13" height="13" fill="white" transform="translate(0.5 0.5)"/>
|
||||
</clipPath>
|
||||
</defs>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 3.9 KiB |
|
|
@ -1,9 +1,3 @@
|
|||
<svg width="16" height="15" viewBox="0 0 16 15" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<rect x="0.5" y="0.5" width="15" height="14" rx="1.5" stroke="#323A3D"/>
|
||||
<line x1="3.5" y1="3.5" x2="4.5" y2="3.5" stroke="#323A3D" stroke-linecap="round"/>
|
||||
<line x1="3.5" y1="7.5" x2="4.5" y2="7.5" stroke="#323A3D" stroke-linecap="round"/>
|
||||
<line x1="3.5" y1="11.5" x2="4.5" y2="11.5" stroke="#323A3D" stroke-linecap="round"/>
|
||||
<line x1="6.5" y1="3.5" x2="12.5" y2="3.5" stroke="#323A3D" stroke-linecap="round"/>
|
||||
<line x1="6.5" y1="7.5" x2="12.5" y2="7.5" stroke="#323A3D" stroke-linecap="round"/>
|
||||
<line x1="6.5" y1="11.5" x2="12.5" y2="11.5" stroke="#323A3D" stroke-linecap="round"/>
|
||||
<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M1.68979 2.09814C1.47311 2.09814 1.26531 2.18422 1.11209 2.33743C0.958878 2.49065 0.872803 2.69845 0.872803 2.91513C0.872803 3.13181 0.958878 3.33961 1.11209 3.49282C1.26531 3.64604 1.47311 3.73211 1.68979 3.73211C1.90646 3.73211 2.11427 3.64604 2.26748 3.49282C2.4207 3.33961 2.50677 3.13181 2.50677 2.91513C2.50677 2.69845 2.4207 2.49065 2.26748 2.33743C2.11427 2.18422 1.90646 2.09814 1.68979 2.09814ZM4.75348 2.30239C4.41392 2.30239 4.14074 2.57557 4.14074 2.91513C4.14074 3.25469 4.41392 3.52787 4.75348 3.52787H12.5148C12.8544 3.52787 13.1276 3.25469 13.1276 2.91513C13.1276 2.57557 12.8544 2.30239 12.5148 2.30239H4.75348ZM4.75348 6.38731C4.41392 6.38731 4.14074 6.66049 4.14074 7.00005C4.14074 7.33961 4.41392 7.61279 4.75348 7.61279H12.5148C12.8544 7.61279 13.1276 7.33961 13.1276 7.00005C13.1276 6.66049 12.8544 6.38731 12.5148 6.38731H4.75348ZM4.75348 10.4722C4.41392 10.4722 4.14074 10.7454 4.14074 11.085C4.14074 11.4245 4.41392 11.6977 4.75348 11.6977H12.5148C12.8544 11.6977 13.1276 11.4245 13.1276 11.085C13.1276 10.7454 12.8544 10.4722 12.5148 10.4722H4.75348ZM2.50677 7.00005C2.50677 6.78337 2.4207 6.57557 2.26748 6.42235C2.11427 6.26914 1.90646 6.18306 1.68979 6.18306C1.47311 6.18306 1.26531 6.26914 1.11209 6.42235C0.958878 6.57557 0.872803 6.78337 0.872803 7.00005C0.872803 7.21673 0.958878 7.42453 1.11209 7.57774C1.26531 7.73096 1.47311 7.81703 1.68979 7.81703C1.90646 7.81703 2.11427 7.73096 2.26748 7.57774C2.4207 7.42453 2.50677 7.21673 2.50677 7.00005ZM1.68979 10.268C1.47311 10.268 1.26531 10.3541 1.11209 10.5073C0.958878 10.6605 0.872803 10.8683 0.872803 11.085C0.872803 11.3016 0.958878 11.5094 1.11209 11.6627C1.26531 11.8159 1.47311 11.902 1.68979 11.902C1.90646 11.902 2.11427 11.8159 2.26748 11.6627C2.4207 11.5094 2.50677 11.3016 2.50677 11.085C2.50677 10.8683 2.4207 10.6605 2.26748 10.5073C2.11427 10.3541 1.90646 10.268 1.68979 10.268Z" fill="#262E30"/>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 687 B After Width: | Height: | Size: 2.0 KiB |
|
|
@ -430,24 +430,23 @@ void ParamsPanel::create_layout()
|
|||
|
||||
if (m_top_panel) {
|
||||
m_mode_sizer = new wxBoxSizer( wxHORIZONTAL );
|
||||
m_mode_sizer->AddSpacer(FromDIP(11));
|
||||
m_mode_sizer->AddSpacer(FromDIP(10));
|
||||
m_mode_sizer->Add(m_process_icon, 0, wxALIGN_CENTER);
|
||||
m_mode_sizer->AddSpacer(FromDIP(11));
|
||||
m_mode_sizer->AddSpacer(FromDIP(10));
|
||||
m_mode_sizer->Add( m_title_label, 0, wxALIGN_CENTER );
|
||||
m_mode_sizer->AddStretchSpacer(2);
|
||||
m_mode_sizer->Add(m_mode_region, 0, wxALIGN_CENTER);
|
||||
m_mode_sizer->AddStretchSpacer(1);
|
||||
m_mode_sizer->Add(m_tips_arrow, 0, wxALIGN_CENTER);
|
||||
m_mode_sizer->AddStretchSpacer(8);
|
||||
m_mode_sizer->AddStretchSpacer(12);
|
||||
m_mode_sizer->Add( m_title_view, 0, wxALIGN_CENTER );
|
||||
m_mode_sizer->AddSpacer(FromDIP(2));
|
||||
m_mode_sizer->Add(m_mode_view, 0, wxALIGN_CENTER);
|
||||
m_mode_sizer->AddStretchSpacer(2);
|
||||
m_mode_sizer->AddSpacer(FromDIP(10));
|
||||
m_mode_sizer->Add(m_setting_btn, 0, wxALIGN_CENTER);
|
||||
m_mode_sizer->AddSpacer(FromDIP(2));
|
||||
m_mode_sizer->AddSpacer(FromDIP(12));
|
||||
m_mode_sizer->Add(m_compare_btn, 0, wxALIGN_CENTER);
|
||||
|
||||
m_mode_sizer->AddSpacer(FromDIP(8));
|
||||
m_mode_sizer->AddSpacer(FromDIP(16));
|
||||
//m_mode_sizer->Add( m_search_btn, 0, wxALIGN_CENTER );
|
||||
//m_mode_sizer->AddSpacer(16);
|
||||
m_mode_sizer->SetMinSize(-1, FromDIP(30));
|
||||
|
|
|
|||
|
|
@ -504,57 +504,58 @@ void Sidebar::priv::layout_printer(bool isBBL, bool isDual)
|
|||
sizer == nullptr || isDual != (sizer->GetOrientation() == wxVERTICAL)) {
|
||||
wxBoxSizer *hsizer_printer_btn = new wxBoxSizer(wxHORIZONTAL);
|
||||
hsizer_printer_btn->AddStretchSpacer(1);
|
||||
hsizer_printer_btn->Add(btn_edit_printer, 0, wxALIGN_CENTER | wxLEFT, FromDIP(4));
|
||||
hsizer_printer_btn->Add(btn_edit_printer, 0);
|
||||
hsizer_printer_btn->Add(btn_connect_printer, 0, wxALIGN_CENTER | wxLEFT, FromDIP(4));
|
||||
combo_printer->SetWindowStyle(combo_printer->GetWindowStyle() & ~wxALIGN_MASK | (isDual ? wxALIGN_CENTER_HORIZONTAL : wxALIGN_RIGHT));
|
||||
if (isDual) {
|
||||
wxBoxSizer *vsizer = new wxBoxSizer(wxVERTICAL);
|
||||
vsizer->AddStretchSpacer(1);
|
||||
wxBoxSizer *hsizer = new wxBoxSizer(wxHORIZONTAL);
|
||||
hsizer->AddStretchSpacer(1);
|
||||
hsizer->Add(image_printer, 0);
|
||||
hsizer->Add(hsizer_printer_btn, 1, wxRIGHT, FromDIP(12));
|
||||
vsizer->Add(hsizer, 0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, FromDIP(4));
|
||||
hsizer->Add(image_printer, 1, wxEXPAND | wxTOP, FromDIP(8));
|
||||
hsizer->Add(hsizer_printer_btn, 1, wxEXPAND, 0);
|
||||
vsizer->AddSpacer(FromDIP(4));
|
||||
vsizer->Add(hsizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(8));
|
||||
vsizer->Add(combo_printer, 0, wxEXPAND | wxALL, FromDIP(4));
|
||||
vsizer->AddStretchSpacer(1);
|
||||
panel_printer_preset->SetSizer(vsizer);
|
||||
} else {
|
||||
wxBoxSizer *hsizer = new wxBoxSizer(wxHORIZONTAL);
|
||||
hsizer->Add(image_printer, 0, wxLEFT | wxALIGN_CENTER, FromDIP(4));
|
||||
wxBoxSizer *vsizer = new wxBoxSizer(wxVERTICAL);
|
||||
vsizer->AddSpacer(FromDIP(4));
|
||||
vsizer->Add(hsizer_printer_btn, 1, wxEXPAND | wxRIGHT, FromDIP(16));
|
||||
vsizer->Add(combo_printer, 0, wxEXPAND | wxLEFT, FromDIP(4));
|
||||
vsizer->AddStretchSpacer(1);
|
||||
vsizer->AddSpacer(FromDIP(4));
|
||||
hsizer->Add(vsizer, 1, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(4));
|
||||
hsizer->Add(combo_printer, 1, wxALIGN_CENTRE | wxLEFT | wxRIGHT, FromDIP(6));
|
||||
hsizer->Add(hsizer_printer_btn, 0, wxALIGN_TOP | wxTOP | wxRIGHT, FromDIP(4));
|
||||
hsizer->AddSpacer(FromDIP(4));
|
||||
panel_printer_preset->SetSizer(hsizer);
|
||||
}
|
||||
}
|
||||
|
||||
if (vsizer_printer->GetItemCount() == 0) {
|
||||
wxBoxSizer *hsizer_printer = new wxBoxSizer(wxHORIZONTAL);
|
||||
hsizer_printer->Add(panel_printer_preset, 1, wxEXPAND);
|
||||
hsizer_printer->Add(panel_printer_preset, 1, wxEXPAND, 0);
|
||||
hsizer_printer->Add(panel_printer_bed, 0, wxLEFT | wxEXPAND, FromDIP(4));
|
||||
hsizer_printer->Add(btn_sync_printer, 0, wxLEFT | wxEXPAND, FromDIP(4));
|
||||
|
||||
vsizer_printer->Add(hsizer_printer, 0, wxEXPAND | wxLEFT | wxRIGHT | wxTOP, FromDIP(4));
|
||||
vsizer_printer->AddSpacer(FromDIP(4));
|
||||
// Printer - extruder
|
||||
|
||||
// double
|
||||
auto hsizer_extruder = new wxBoxSizer(wxHORIZONTAL);
|
||||
hsizer_extruder->AddSpacer(FromDIP(4));
|
||||
hsizer_extruder->Add(left_extruder->sizer, 1, wxEXPAND);
|
||||
hsizer_extruder->Add(right_extruder->sizer, 1, wxLEFT | wxEXPAND, FromDIP(4));
|
||||
hsizer_extruder->AddSpacer(FromDIP(4));
|
||||
|
||||
// single
|
||||
vsizer_printer->Add(hsizer_extruder, 0, wxEXPAND | wxLEFT, 0);
|
||||
vsizer_printer->Add(single_extruder->sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(4));
|
||||
|
||||
vsizer_printer->Add(hsizer_printer, 0, wxEXPAND | wxLEFT | wxRIGHT | wxTOP, FromDIP(4));
|
||||
vsizer_printer->Add(hsizer_extruder, 0, wxEXPAND | wxLEFT | wxRIGHT | wxTOP, FromDIP(4));
|
||||
vsizer_printer->Add(single_extruder->sizer, 0, wxEXPAND | wxLEFT | wxRIGHT | wxTOP, FromDIP(4));
|
||||
vsizer_printer->AddSpacer(FromDIP(4));
|
||||
}
|
||||
|
||||
btn_connect_printer->Show(!isBBL);
|
||||
btn_sync_printer->Show(isDual);
|
||||
panel_printer_bed->Show(isBBL);
|
||||
vsizer_printer->GetItem(1)->GetSizer()->GetItem(1)->Show(isDual);
|
||||
vsizer_printer->GetItem(1)->Show(isBBL && isDual);
|
||||
vsizer_printer->GetItem(2)->Show(isBBL && !isDual);
|
||||
vsizer_printer->GetItem(2)->GetSizer()->GetItem(1)->Show(isDual);
|
||||
vsizer_printer->GetItem(2)->Show(isBBL && isDual);
|
||||
vsizer_printer->GetItem(3)->Show(isBBL && !isDual);
|
||||
}
|
||||
|
||||
void Sidebar::priv::flush_printer_sync(bool restart)
|
||||
|
|
@ -896,8 +897,9 @@ ExtruderGroup::ExtruderGroup(wxWindow * parent, int index, wxString const &title
|
|||
: StaticGroup(parent, wxID_ANY, title)
|
||||
{
|
||||
SetFont(Label::Body_10);
|
||||
SetForegroundColour(wxColour(0xCECECE));
|
||||
SetBorderColor(wxColour(0xEEEEEE));
|
||||
ShowBadge(true);
|
||||
|
||||
// Nozzle
|
||||
wxStaticText *label_diameter = new wxStaticText(this, wxID_ANY, _L("Diameter"));
|
||||
label_diameter->SetFont(Label::Body_14);
|
||||
|
|
@ -950,8 +952,8 @@ ExtruderGroup::ExtruderGroup(wxWindow * parent, int index, wxString const &title
|
|||
|
||||
// AMS not installed message
|
||||
ams_not_installed_msg = new wxStaticText(this, wxID_ANY, _L("Not installed"));
|
||||
label_ams->SetFont(Label::Body_14);
|
||||
label_ams->SetForegroundColour("#262E30");
|
||||
ams_not_installed_msg->SetFont(Label::Body_14);
|
||||
ams_not_installed_msg->SetForegroundColour("#262E30");
|
||||
|
||||
// AMS group
|
||||
for (size_t i = 0; i < 4; ++i) {
|
||||
|
|
@ -992,7 +994,7 @@ ExtruderGroup::ExtruderGroup(wxWindow * parent, int index, wxString const &title
|
|||
label_ams->Hide();
|
||||
ams_not_installed_msg->Hide();
|
||||
wxStaticBoxSizer *hsizer = new wxStaticBoxSizer(this, wxHORIZONTAL);
|
||||
hsizer->Add(hsizer_diameter, 1, wxEXPAND | wxALL, FromDIP(8));
|
||||
hsizer->Add(hsizer_diameter, 1, wxEXPAND | wxTOP| wxBOTTOM, FromDIP(8));
|
||||
hsizer->Add(hsizer_nozzle, 1, wxEXPAND | wxALL, FromDIP(8));
|
||||
this->sizer = hsizer;
|
||||
} else {
|
||||
|
|
@ -1002,7 +1004,6 @@ ExtruderGroup::ExtruderGroup(wxWindow * parent, int index, wxString const &title
|
|||
vsizer->Add(hsizer_nozzle, 0, wxEXPAND | wxALL, FromDIP(2));
|
||||
this->sizer = vsizer;
|
||||
}
|
||||
|
||||
AMSCountPopupWindow::UpdateAMSCount(index < 0 ? 0 : index, this);
|
||||
}
|
||||
|
||||
|
|
@ -1523,9 +1524,13 @@ Sidebar::Sidebar(Plater *parent)
|
|||
p->m_panel_printer_content = new wxPanel(p->scrolled, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
|
||||
p->m_panel_printer_content->SetBackgroundColour(wxColour(255, 255, 255));
|
||||
|
||||
StateColor panel_bd_col(std::pair<wxColour, int>(wxColour(0x00AE42), StateColor::Pressed),
|
||||
std::pair<wxColour, int>(wxColour(0x00AE42), StateColor::Hovered),
|
||||
std::pair<wxColour, int>(wxColour(0xEEEEEE), StateColor::Normal));
|
||||
|
||||
p->panel_printer_preset = new StaticBox(p->m_panel_printer_content);
|
||||
p->panel_printer_preset->SetCornerRadius(8);
|
||||
p->panel_printer_preset->SetBorderColor(wxColour("#CECECE"));
|
||||
p->panel_printer_preset->SetBorderColor(panel_bd_col);
|
||||
p->panel_printer_preset->SetMinSize(PRINTER_PANEL_SIZE_SMALL);
|
||||
p->panel_printer_preset->Bind(wxEVT_LEFT_DOWN, [this](auto & evt) {
|
||||
p->combo_printer->wxEvtHandler::ProcessEvent(evt);
|
||||
|
|
@ -1573,7 +1578,7 @@ Sidebar::Sidebar(Plater *parent)
|
|||
// Bed type selection
|
||||
p->panel_printer_bed = new StaticBox(p->m_panel_printer_content);
|
||||
p->panel_printer_bed->SetCornerRadius(8);
|
||||
p->panel_printer_bed->SetBorderColor(wxColour("#CECECE"));
|
||||
p->panel_printer_bed->SetBorderColor(panel_bd_col);
|
||||
p->panel_printer_bed->SetMinSize(PRINTER_PANEL_SIZE_SMALL);
|
||||
p->panel_printer_bed->Bind(wxEVT_LEFT_DOWN, [this](auto &evt) {
|
||||
p->combo_printer_bed->wxEvtHandler::ProcessEvent(evt);
|
||||
|
|
@ -1626,19 +1631,17 @@ Sidebar::Sidebar(Plater *parent)
|
|||
});
|
||||
p->image_printer_bed->Bind(wxEVT_LEAVE_WINDOW, [this](wxMouseEvent &evt) { p->big_bed_image_popup->on_hide(); });
|
||||
|
||||
wxBoxSizer *bed_type_sizer = new wxBoxSizer(wxVERTICAL);
|
||||
bed_type_sizer->AddStretchSpacer(1);
|
||||
wxBoxSizer *bed_type_vsizer = new wxBoxSizer(wxVERTICAL);
|
||||
bed_type_vsizer->AddStretchSpacer(1);
|
||||
wxBoxSizer *bed_type_hsizer = new wxBoxSizer(wxHORIZONTAL);
|
||||
wxBoxSizer *bed_type_hsizer2 = new wxBoxSizer(wxHORIZONTAL);
|
||||
bed_type_hsizer2->AddStretchSpacer(1);
|
||||
bed_type_hsizer2->Add(wiki_bed, 0, wxLEFT, FromDIP(4));
|
||||
bed_type_hsizer->Add(bed_type_hsizer2, 1);
|
||||
bed_type_hsizer->Add(p->image_printer_bed, 0);
|
||||
bed_type_hsizer->AddStretchSpacer(1);
|
||||
bed_type_sizer->Add(bed_type_hsizer, 0, wxALIGN_CENTER | wxLEFT | wxTOP | wxRIGHT, FromDIP(2));
|
||||
bed_type_sizer->Add(p->combo_printer_bed, 0, wxEXPAND | wxALL, FromDIP(2));
|
||||
bed_type_sizer->AddStretchSpacer(1);
|
||||
p->panel_printer_bed->SetSizer(bed_type_sizer);
|
||||
bed_type_hsizer->Add(p->image_printer_bed, 1, wxEXPAND | wxTOP, FromDIP(8));
|
||||
bed_type_hsizer->Add(wiki_bed, 1, wxTOP, FromDIP(2));
|
||||
bed_type_vsizer->Add(bed_type_hsizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(8));
|
||||
bed_type_vsizer->Add(p->combo_printer_bed, 0, wxEXPAND | wxALL, FromDIP(2));
|
||||
bed_type_vsizer->AddStretchSpacer(1);
|
||||
|
||||
p->panel_printer_bed->SetSizer(bed_type_vsizer);
|
||||
|
||||
AppConfig *app_config = wxGetApp().app_config;
|
||||
std::string str_bed_type = app_config->get("curr_bed_type");
|
||||
|
|
@ -1694,6 +1697,7 @@ Sidebar::Sidebar(Plater *parent)
|
|||
p->left_extruder = new ExtruderGroup(p->m_panel_printer_content, 0, _L("Left Nozzle"));
|
||||
p->right_extruder = new ExtruderGroup(p->m_panel_printer_content, 1, _L("Right Nozzle"));
|
||||
p->single_extruder = new ExtruderGroup(p->m_panel_printer_content, -1, _L("Nozzle"));
|
||||
|
||||
auto switch_diameter = [this](wxCommandEvent & evt) {
|
||||
auto extruder = dynamic_cast<ExtruderGroup *>(dynamic_cast<ComboBox *>(evt.GetEventObject())->GetParent());
|
||||
p->is_switching_diameter = true;
|
||||
|
|
@ -1808,9 +1812,9 @@ Sidebar::Sidebar(Plater *parent)
|
|||
}
|
||||
}));
|
||||
|
||||
bSizer39->Add(p->m_flushing_volume_btn, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(4));
|
||||
bSizer39->Add(p->m_flushing_volume_btn, 0, wxALIGN_CENTER_VERTICAL, FromDIP(4));
|
||||
bSizer39->Hide(p->m_flushing_volume_btn);
|
||||
bSizer39->Add(FromDIP(10), 0, 0, 0, 0 );
|
||||
bSizer39->Add(FromDIP(12), 0, 0, 0, 0 );
|
||||
|
||||
ScalableButton* add_btn = new ScalableButton(p->m_panel_filament_title, wxID_ANY, "add_filament");
|
||||
add_btn->SetToolTip(_L("Add one filament"));
|
||||
|
|
@ -1819,8 +1823,8 @@ Sidebar::Sidebar(Plater *parent)
|
|||
});
|
||||
p->m_bpButton_add_filament = add_btn;
|
||||
|
||||
bSizer39->Add(add_btn, 0, wxALIGN_CENTER|wxALL, FromDIP(4));
|
||||
bSizer39->Add(FromDIP(10), 0, 0, 0, 0 );
|
||||
bSizer39->Add(add_btn, 0, wxALIGN_CENTER_VERTICAL, FromDIP(4));
|
||||
bSizer39->Add(FromDIP(12), 0, 0, 0, 0 );
|
||||
|
||||
ScalableButton* del_btn = new ScalableButton(p->m_panel_filament_title, wxID_ANY, "delete_filament");
|
||||
del_btn->SetToolTip(_L("Remove last filament"));
|
||||
|
|
@ -1830,7 +1834,7 @@ Sidebar::Sidebar(Plater *parent)
|
|||
p->m_bpButton_del_filament = del_btn;
|
||||
|
||||
bSizer39->Add(del_btn, 0, wxALIGN_CENTER_VERTICAL, FromDIP(4));
|
||||
bSizer39->Add(FromDIP(20), 0, 0, 0, 0);
|
||||
bSizer39->Add(FromDIP(12), 0, 0, 0, 0);
|
||||
|
||||
ams_btn = new ScalableButton(p->m_panel_filament_title, wxID_ANY, "ams_fila_sync", wxEmptyString, wxDefaultSize, wxDefaultPosition,
|
||||
wxBU_EXACTFIT | wxNO_BORDER, false, 18);
|
||||
|
|
@ -1842,8 +1846,8 @@ Sidebar::Sidebar(Plater *parent)
|
|||
ams_btn->Bind(wxEVT_UPDATE_UI, &Sidebar::update_sync_ams_btn_enable, this);
|
||||
p->m_bpButton_ams_filament = ams_btn;
|
||||
|
||||
bSizer39->Add(ams_btn, 0, wxALIGN_CENTER|wxALL, FromDIP(4));
|
||||
bSizer39->Add(FromDIP(10), 0, 0, 0, 0 );
|
||||
bSizer39->Add(ams_btn, 0, wxALIGN_CENTER, FromDIP(4));
|
||||
bSizer39->Add(FromDIP(12), 0, 0, 0, 0 );
|
||||
|
||||
ScalableButton* set_btn = new ScalableButton(p->m_panel_filament_title, wxID_ANY, "settings");
|
||||
set_btn->SetToolTip(_L("Set filaments to use"));
|
||||
|
|
@ -1856,7 +1860,7 @@ Sidebar::Sidebar(Plater *parent)
|
|||
p->m_bpButton_set_filament = set_btn;
|
||||
|
||||
bSizer39->Add(set_btn, 0, wxALIGN_CENTER);
|
||||
bSizer39->Add(FromDIP(15), 0, 0, 0, 0);
|
||||
bSizer39->Add(FromDIP(16), 0, 0, 0, 0);
|
||||
|
||||
// add filament content
|
||||
p->m_panel_filament_content = new wxPanel( p->scrolled, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
||||
|
|
@ -1982,9 +1986,9 @@ void Sidebar::init_filament_combo(PlaterPresetComboBox **combo, const int filame
|
|||
|
||||
// BBS: filament double columns
|
||||
int em = wxGetApp().em_unit();
|
||||
combo_and_btn_sizer->Add(FromDIP(8), 0, 0, 0, 0 );
|
||||
combo_and_btn_sizer->Add(FromDIP(10), 0, 0, 0, 0 );
|
||||
(*combo)->clr_picker->SetLabel(wxString::Format("%d", filament_idx + 1));
|
||||
combo_and_btn_sizer->Add((*combo)->clr_picker, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, FromDIP(3));
|
||||
combo_and_btn_sizer->Add((*combo)->clr_picker, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, FromDIP(4));
|
||||
combo_and_btn_sizer->Add(*combo, 1, wxALL | wxEXPAND, FromDIP(2))->SetMinSize({-1, FromDIP(30)});
|
||||
|
||||
/* BBS hide del_btn
|
||||
|
|
@ -2015,9 +2019,9 @@ void Sidebar::init_filament_combo(PlaterPresetComboBox **combo, const int filame
|
|||
});
|
||||
combobox->edit_btn = edit_btn;
|
||||
|
||||
combo_and_btn_sizer->Add(edit_btn, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(3));
|
||||
combo_and_btn_sizer->Add(edit_btn, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(4));
|
||||
|
||||
combo_and_btn_sizer->Add(FromDIP(8), 0, 0, 0, 0);
|
||||
combo_and_btn_sizer->Add(FromDIP(16), 0, 0, 0, 0);
|
||||
|
||||
// BBS: filament double columns
|
||||
auto side = filament_idx % 2;
|
||||
|
|
|
|||
|
|
@ -346,13 +346,13 @@ void Tab::create_preset_tab()
|
|||
m_main_sizer = new wxBoxSizer( wxVERTICAL );
|
||||
m_top_sizer = new wxBoxSizer( wxHORIZONTAL );
|
||||
|
||||
m_top_sizer->Add(m_undo_btn, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, 5);
|
||||
m_top_sizer->Add(m_undo_btn, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, FromDIP(10));
|
||||
// BBS: model config
|
||||
if (m_presets_choice) {
|
||||
m_presets_choice->Reparent(m_top_panel);
|
||||
m_top_sizer->Add(m_presets_choice, 1, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, 8);
|
||||
m_top_sizer->Add(m_presets_choice, 1, wxLEFT | wxALIGN_CENTER_VERTICAL, FromDIP(10));
|
||||
} else {
|
||||
m_top_sizer->AddSpacer(10);
|
||||
m_top_sizer->AddSpacer(FromDIP(10));
|
||||
m_top_sizer->AddStretchSpacer(1);
|
||||
}
|
||||
|
||||
|
|
@ -361,10 +361,10 @@ void Tab::create_preset_tab()
|
|||
m_top_sizer->Add( m_undo_to_sys_btn, 0, wxALIGN_CENTER_VERTICAL);
|
||||
m_top_sizer->AddSpacer(8);
|
||||
#endif
|
||||
m_top_sizer->Add( m_btn_save_preset, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, 8 );
|
||||
m_top_sizer->Add( m_btn_delete_preset, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, 8 );
|
||||
m_top_sizer->Add( m_btn_search, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, 8 );
|
||||
m_top_sizer->Add( m_search_item, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT , 8 );
|
||||
m_top_sizer->Add( m_btn_save_preset, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(12));
|
||||
m_top_sizer->Add( m_btn_delete_preset, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(12) );
|
||||
m_top_sizer->Add( m_btn_search, 0, wxALIGN_CENTER_VERTICAL | wxLEFT , FromDIP(12) );
|
||||
m_top_sizer->Add(m_search_item, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT | wxLEFT, FromDIP(12));
|
||||
|
||||
if (dynamic_cast<TabPrint*>(this) == nullptr) {
|
||||
m_static_title = new Label(m_top_panel, Label::Body_12, _L("Advance"));
|
||||
|
|
@ -379,7 +379,7 @@ void Tab::create_preset_tab()
|
|||
m_top_sizer->Add( m_mode_view, 0, wxALIGN_CENTER_VERTICAL);
|
||||
}
|
||||
|
||||
m_top_sizer->AddSpacer(10);
|
||||
m_top_sizer->AddSpacer(FromDIP(16));
|
||||
|
||||
m_top_sizer->SetMinSize(-1, 3 * m_em_unit);
|
||||
m_top_panel->SetSizer(m_top_sizer);
|
||||
|
|
@ -6368,7 +6368,7 @@ void Page::activate(ConfigOptionMode mode, std::function<void()> throw_if_cancel
|
|||
for (auto group : m_optgroups) {
|
||||
if (!group->activate(throw_if_canceled))
|
||||
continue;
|
||||
m_vsizer->Add(group->sizer, 0, wxEXPAND | (group->is_legend_line() ? (wxLEFT|wxTOP) : wxALL), 5);
|
||||
m_vsizer->Add(group->sizer, 0, wxEXPAND | (group->is_legend_line() ? (wxLEFT|wxTOP) : wxALL), 10);
|
||||
group->update_visibility(mode);
|
||||
#if HIDE_FIRST_SPLIT_LINE
|
||||
if (first) group->stb->Hide();
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ StaticGroup::StaticGroup(wxWindow *parent, wxWindowID id, const wxString &label)
|
|||
{
|
||||
SetBackgroundColour(*wxWHITE);
|
||||
SetForegroundColour("#CECECE");
|
||||
borderColor_ = wxColour("#CECECE");
|
||||
#ifdef __WXMSW__
|
||||
Bind(wxEVT_PAINT, &StaticGroup::OnPaint, this);
|
||||
#endif
|
||||
|
|
@ -33,8 +34,12 @@ void StaticGroup::ShowBadge(bool show)
|
|||
#endif
|
||||
}
|
||||
|
||||
#ifdef __WXMSW__
|
||||
void StaticGroup::SetBorderColor(const wxColour &color)
|
||||
{
|
||||
borderColor_ = color;
|
||||
}
|
||||
|
||||
#ifdef __WXMSW__
|
||||
void StaticGroup::OnPaint(wxPaintEvent &evt)
|
||||
{
|
||||
wxStaticBox::OnPaint(evt);
|
||||
|
|
@ -63,7 +68,7 @@ void StaticGroup::PaintForeground(wxDC &dc, const struct tagRECT &rc)
|
|||
while (image.GetBlue(0, bottom) == blue && bottom > 0) --bottom;
|
||||
// Draw border with foreground color
|
||||
wxPoint polygon[] = { {left, top}, {0, top}, {0, bottom}, {rc.right - 1, bottom}, {rc.right - 1, top}, {right, top} };
|
||||
dc.SetPen(wxPen(GetForegroundColour(), 1));
|
||||
dc.SetPen(wxPen(borderColor_, 1));
|
||||
for (int i = 1; i < 6; ++i) {
|
||||
if (i == 4) // fix bottom right corner
|
||||
++polygon[i - 1].y;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ public:
|
|||
|
||||
public:
|
||||
void ShowBadge(bool show);
|
||||
|
||||
void SetBorderColor(const wxColour &color);
|
||||
private:
|
||||
#ifdef __WXMSW__
|
||||
void OnPaint(wxPaintEvent &evt);
|
||||
|
|
@ -26,6 +26,7 @@ private:
|
|||
#ifdef __WXOSX__
|
||||
ScalableButton * badge { nullptr };
|
||||
#endif
|
||||
wxColour borderColor_;
|
||||
};
|
||||
|
||||
#endif // !slic3r_GUI_StaticGroup_hpp_
|
||||
|
|
|
|||
Loading…
Reference in New Issue