From 9b5c939fd0aa49ac15f3f68947db840593aa427b Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 17 Jan 2022 11:17:36 +0300 Subject: [PATCH] Update window title controls. --- icons/title_button_close.png | Bin 164 -> 262 bytes icons/title_button_close@2x.png | Bin 472 -> 416 bytes icons/title_button_close@3x.png | Bin 631 -> 527 bytes icons/title_button_maximize.png | Bin 119 -> 277 bytes icons/title_button_maximize@2x.png | Bin 144 -> 332 bytes icons/title_button_maximize@3x.png | Bin 184 -> 498 bytes icons/title_button_minimize.png | Bin 100 -> 211 bytes icons/title_button_minimize@2x.png | Bin 122 -> 242 bytes icons/title_button_minimize@3x.png | Bin 149 -> 340 bytes icons/title_button_restore.png | Bin 136 -> 380 bytes icons/title_button_restore@2x.png | Bin 160 -> 507 bytes icons/title_button_restore@3x.png | Bin 209 -> 779 bytes ui/widgets/widgets.style | 75 +++++++++++++++-------------- 13 files changed, 39 insertions(+), 36 deletions(-) diff --git a/icons/title_button_close.png b/icons/title_button_close.png index 22cfe520c4a6e3b0da93e628ac6a63dbdfbd3ff8..d2f10dbc61e41d5047cf33601a79c4b6b5e8757f 100644 GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^GC(ZB!2~4J{&8IeQjEnx?oJHr&dIz4a$Hg)JkxxA z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvPE3<$Z&XxcvoM;=A1f&W)T^vI! z1d|gaSQjfgY!~?O@ndIa=fN#}8XQv&iKu(AtoV6VRCwgTe~DWM4fa(F?q diff --git a/icons/title_button_close@2x.png b/icons/title_button_close@2x.png index b281004394857af8156b7831ce53babf80b4003e..89bfa1bd9fa3db866be31321de5b1b4f02a479e9 100644 GIT binary patch delta 355 zcmcb?yntD;Gr-TCmrII^fq{Y7)59eQNLv800S6P1JiT2{Wul@-y~P4%1{NTn5hMe| z47TdZlYm?delL7d?|KzCC`n_-o-@%Q&#q~%k1pDp^*!|Ld!K{l&v#tB`KkKne)(F@&O%euprzX~lT5|025~bp zP1vwiU`1qO6$K8D11C!{an^LB{Ts5y=#q_ delta 411 zcmV;M0c8H51K0y0iBL{Q4GJ0x0000DNk~Le0000U0000Q2nGNE0HC4lw2>i5e;%L% z00aO40096102%-Q002M1k;MQ20YXVcK~zW$&6Z6Lgdhxs!FWPl=mEUGTURQ>BQjBF zDfl*YN4}2xV9!G5$1~W~Q8OPByO%sh% zKIm)P*7?8}F}QiQKZe?D9n@?#f6ue&x-J#OjrDzRFxMO4h($3-u$9VX?E~N|!9yr~ zpcZ0fgE0~E?z2z9DJXn}EsCY~8A4tO&OtM_h6f{o6#N1d@~6QZd|4KQwm0b<1S}cM z!7o7bR_rr{?BOZ_M_t93OHDx^KU@^lai8AQUyW04 z*H24}2`Q)#Z~;z(amz?mOM(}d%rln+wesRi;_S5;!i%p(NO<-k0C}-e=^=oM;L4Z% zMuz9hx~{H8gNY72ebDR~VP_@5tk(?#MJ4kF-Z#Y0z#pIu>>%74bP@mn002ovPDHLk FV1nEssA&KI diff --git a/icons/title_button_close@3x.png b/icons/title_button_close@3x.png index c4bf8197947da4888a2393423b43ad4e3a26aeb9..9db41de94bbc4ce17d63d47f1e23f0468b30204c 100644 GIT binary patch delta 467 zcmey)($AvU8Q|y6%O%Cdz`(%k>ERLtq(gw%gM$f3K9_YZo2ckfAF_a%fd$BC1jzs~ zgHXlx!$5AOr;B4q1>@V9XS-Sq1lZbZ_5J77)Za<}xb1e2Li5BMKcn98g!SF34^2}@ ziPINjGiYGsNnl`>IKY6;v^jFXfM@@E)4pVuo0qOzg&71rzZNt5$NRn0QfDr!_k5k( zIc?vyjZIM#Th{R2bG!b-{^Z&dHs?7dqP%afyX`Lgqx?yj){oB@HNLD7Ixw%|)XC0y zkG>z}kZ?LxYqNIltb|!j(ds8V%atq-7fC3^`XBUTR=WGSSi53s_|M{a(}Rjn9v)t8 z^(}O{ORo(3ucXgDn;*yfuRr8?;_~X_GbY8?TQeQMS@%eF#RJoTx^Jb=(`#$q-}$&h zb|>TQsw3z3sccto=YKry_o{%#HG5ulJI;P4^4`SZ_3ZgiS&G}9e*U4J;grSo?fe8` z%>x{omN{S78MV!cnE!m=_Wpeb_WXJEOZ)xXw+!jGBW@SX|NVdVySMUx%cp)@dGZiE gkTfv@tnust`{mj)8Aex?kAmXE)78&qol`;+04fj7vj6}9 delta 572 zcmV-C0>k}}1os3XiBL{Q4GJ0x0000DNk~Le0000j0000d2nGNE0Golq{E;C@e=VQ` z00aO40096104D$d000aa9q|AF0pUqRK~z`??U-w-gD?<<(@RUK(4XzTbtx5ePi{bw zO0Gu?6d%c%B$iq_AeK0D=IdmPBnPFG?yp_h->zs!*dO$}X6^ecog|4m9*&r)jFsf9JC`#-)k)EXxKx=sq3~jXbWn@wpusP5_=-S(e`5 z04|DRDmj2hf$pbnsPHU9KY+y2imw4f|M`4s*BKZ+G4_%c`Qt(K? z;m`obOXuogJcl3rBV1u3%u8u{`y(nX0geprS7{&Mh~RQ)2H4f(fvqBgW`F_oF<(R$ z7=G+>=vi^D(o$fvtog>7fB2QV8#**`X#4`W8ydT2n=w<&fJfW8>~fFz?%nw1a$!F6 z?)Jbz%G8*aSm;ITs)9UgF_UpOG){gXh;xaUCrs#J=s_3yx7&?^K8*jMzqt)(Zf)DD zK8f3z^uSr(>2y+cU6TN^5+IfWVg?501&j>LK$;OGwtxvPE3<$Z&XxcvoM;=A1f=RcT^vI! z1m8~D$a_FRfH_d)AdAlds|!Z_vcelUZyPWP2dK&&@E2SX@_*_1Iz{_qFEW__n+P~b zB-*&&RJ1x`S&pqa)X%N8janga#b>9BB9!Gxs wm96`}wrAqAhJ*zf>ho&;-Hl7Vb)cOsZud_A`;0G7O#wN{)78&qol`;+0H@w QK$93eUHx3vIVCg!0O)}s5dZ)H diff --git a/icons/title_button_maximize@2x.png b/icons/title_button_maximize@2x.png index 00daaae190fcb9c1850a3310d52ce1d8b17e11ca..708654fb09537879214cbed56d4e8d387dedbf62 100644 GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^7C>yk!2~2vZ`V@+QjEnx?oJHr&dIz4a$Hg)JkxxA z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvPYq5YC&Ncukv{hH01f;fkx;TbJ zaK62Mkn@OwKpUnAvc%moA z!Rq@_#pimj{EsUBwPZ?~wC9sE=h&A1+dQFC<&e|Xn}V(((GI)i(?tSv8Q<2;3Cz71 s9{*Wxr^Wi3h5LVsM&6W>gxf32#D2j*Y+YQhRw>9Qp00i_>zopr0Q_xhVgLXD literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Ey!3HF+&5pANQsJI1jv*eMZ>Je@9WdZw_Fwq_ z|0e5HPSXmGj1?xgocSUx!~!I?&go}oc<@pxw0yDR%guS^3Jkeyex=55OwLZY+sMG8 rz`!Vxf9Ur9$J2nkj+mqM>=le|%G@S}fEakt z!T5HjVONWTfNOi{!3#cnn$tfp-8**RfN+Jha{eP(kuzsZCfsdmJmh(O(Tbz#SNML^ zef=$5xrZ7z1!}82ROnW z6n>wddUKPGyz=aQ95G5f-~Z>HShZ@EMwj^qoAafyz7Hzrse3AEG?OOYZHG+TudjSmnH=r^Tnw-k*PL=7DE(TiZJq|1=1- z;CK3b?$F^Q7i(r{&0$|ynf@^GQHGt5=(*+#dp3VCC^V5@#`WAW<6dON42#px`X67Y zm7Hf7A9$VP?61#I=j@h$5=kH5>*@Bawf(;9mF}mV o;!}^+s}!Jl8y*-37W4jLI-cpjac8%^KPbFCUHx3vIVCg!074GGc>n+a literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^20*ON!3HEfFP>fkr0P9g977^n-`))5YB1nox#;`x zpL?EdW7M5P0ynzYWF z(XpBTET6wmU(0Y(exvo`Prkpkr!Yh@WpFM~1*(Yp%}_nFc)H2_zhL fik~kGq~fkvK3~v*@74E!PGRtL^>bP0l+XkK=VnL= diff --git a/icons/title_button_minimize.png b/icons/title_button_minimize.png index 85934ddde82b3cd1145635cb7d27990c40a2d6ca..93c120ee1b7c1ce1d05c185179b15ed6d4521a1d 100644 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^GC(ZB!2~4J{&8IeQjEnx?oJHr&dIz4a$Hg)JkxxA z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvPE3<$Z&XxcvoM;=A1f*;|T^vI! z1d|gaSQjfANHGD4M@|ib{r$zo#jUNa8?`Eae|!7nyk!2~2vZ`V@+QjEnx?oJHr&dIz4a$Hg)JkxxA z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvPYq5YC&Ncukv{hH01f*g-T^vIq zINx5_$a}zngXQ4yzuTGL-n>$9(Od4*)rFSF1r;0`7#NvYI0TRw57-*t)h)hl@O%HJ wocU)Ctz9+gqWbOGGj)1gH(QEA6+c+dB=79z=*y^C;R>?P)78&qol`;+03$y-OaK4? literal 122 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Ey!3HF+&5pANQjVT3jv*eMZ?A3SWia4iK3G2G zZ@3zFi=L3{JRz?6D`XZ(%rTYJb7){-WMbhEVA!zR`ReUOQ=aUS|KHG%p#4v_fWb0@ V)mTvD=VG8?44$rjF6*2UngCEZBTxVU diff --git a/icons/title_button_minimize@3x.png b/icons/title_button_minimize@3x.png index 93e36c271dd9953cc321759af5337f39141de495..64d3d5a5997b8444068249d257c051d4ab884acf 100644 GIT binary patch literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^AwcZG!2~3q%es~UDaPU;cPEB*=VV?2IWDOYo@u_m z3|c@o2Loe!CIbsd2@p#GF#`kh0!9XAAk7F8TfhXD4OzepXM2DY3RP@B45apXx;TbZ zFuuLGk@tuK59@^|vv>~q`5aYQBVx#5QtokG%{OI<$a&Ri``;Yjrpd&@A)w&Uz`#f> zV~6;S_tE^;noH+=E|lSazW!L%`>ofm-3tBeoBzDBPW(y_?|!3y&!0bh82yj=yKTj7 z{~wEzdp?|z+@WOl??;f=k444>$JQB4^~7dnV>#C!29<@yS6NC=X@Gp>>FVdQ&MBb@ E07D90)&Kwi literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^20*ON!3HEfFP>fkq+&c>977^n-`+IjI$*%Va&Y&9 z|Mih|PE49&2mRI_>bBbHsn%`#h54URLmIN^5+IfWVg?501&j>LK$;OGwtxvPE3<$Z&XxcvoM;=A1f-sMx;Tbd z2)+$64z+4`I%cb=^QqAGW&Vux7zusH!b>NjyPzUbSd5czOz?g(z2H( zz6**4oAuS0w&hxT3SBnYcur#VDlVb!MF*^ol`qV_E!Adt-q@^S9(&3C^4RMe`##35 zcx+K9bG@{eH}?9@b=Ex0Vyr$a|F~);s{TBG#m?`%Fwg5{=!@9px3{r6Dp=^Aj=EkN zIc-^Hi@N5l=axSnUio;y^WaL)pI0YkJy^?D$CDJP+})sk66AAFS3j3^P6yk!2~2vZ`V@+QjEnx?oJHr&dIz4a$Hg)JkxxA z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvPYq5YC&Ncukv{hH01XPyl>Eaj? z!TENYVOFbyKwG?zz>!N{8#jF5ii(Kpa{t62=ODnZ$k8-)YH#n_rE^~}@?w~if3qO^epQ~i4t|P5((n}+7Di^c0QMN%7CXWQRnohorcRYgJlPQTEVJsudk^?kK#paZ8{?DfAt zmpqR%@Xl}z+!D=g;^H&qjEm&;7wh()X3hALwZx;OS>vYr$ztbCa{nUu|3{i|F!^47 zz*fBN@Ljj=MFzf~*LYv}KijnG`^h5*KCKjaw)x-6bv!4}Y*%lKo6!Uc0$6wy%sXIi W<(<>faK^kA6!4y|elF{r5}E)uFTFPa literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Ey!3HF+&5pANQt6&9jv*eMZ>I-x9WdZ=Dt+@W z{MqIyVf(F!t!yGE!*kUIn2XrsKm>;9&`;gwlW3Q+Npm;amC7jp^PvS%t^16s-8>FVdQ I&MBb@0A_(UdjJ3c diff --git a/icons/title_button_restore@3x.png b/icons/title_button_restore@3x.png index 44b93232b2bf02340aee9fd69ea25cba61f75308..98a55e609752bfa4124a240aa4843d218cff8641 100644 GIT binary patch literal 779 zcmeAS@N?(olHy`uVBq!ia0vp^AwcZG!2~3q%es~UDaPU;cPEB*=VV?2IWDOYo@u_m z3|c@o2Loe!CIbsd2@p#GF#`kh0!9XAAk7F8TfhXD4OzepXM2DY3RP@B%)r1@>gnPb zQo;Ck#`#y7fg;E2^@4;_7kHeE@bQt5@KB3um~uV9ZP_Vj55c8-7?-gvIdOn_!3={B z=DW)8`mHVb#k(ze_s#vkO{0F#*?TSS{`p(K=OowGK4fQ7V8Dswy$*co|LnE=^2(4? zNgFxVRqwt#?R4t?`}5B~Z_<;u>Yei6>{qtg?7Z#2om)GXgz8Q2&HDd(d(>K{#)cD4 z^DWecI%W9U!@qp5vYqUCD{!iqhrqV`@B5EGew2PMZ~NuMlWCh}?B}1~9;GYyuV!)3 z$`5rfORVhUKP*0!U~uA*`s9<3*M{d@3_rIydq>PV7bQWy_FS{u!TY|1Nb|K{e);8M z_U^l%Ch#%co}ZCoH1liK*{wziCQ`i1FQ2?6!^h4ZsUueN_i;~vMv2{g%kaZ&FVk~R zb-XXz-NyP_=H=BDFY6~){7knK>&}$C|NeW>$}RWb?`%+V)0^(CHu;th*HY_0N`gn8 zpAdilwQB2A^Vz;zqeT5%(>GPjKYv{Oe&U}h_khqOr#)IzC(TvY(x1IT>tjG=sFtd= zzo}OJ-nf^OJulZ;%}sF(aI4vU_nOJ|*QJqgTe~DWM4fNApFj literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^20*ON!3HEfFP>fkq-J=!IEF;DzMUD!bwGi~Ir`?` z{x!P~v}|2^dehTduBQHJZWqtyNE$NNHfViea!>snb-r}|?)Y_=!yTA1R2r6OA4uAHT)bD?nlN{9PSLJrD|CV9V<4?F1>Fh#x+iJtuVtu4@v44$rjF6*2U FngGSRQknn& diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style index 785c41c..0a85f1f 100644 --- a/ui/widgets/widgets.style +++ b/ui/widgets/widgets.style @@ -1433,90 +1433,93 @@ shakeShift: 4px; // Windows specific title +windowTitleButtonWidth: 28px; +windowTitleHeight: 24px; windowTitleButton: IconButton { - width: 24px; - height: 21px; + width: windowTitleButtonWidth; + height: windowTitleHeight; iconPosition: point(0px, 0px); } windowTitleButtonClose: IconButton(windowTitleButton) { - width: 25px; + width: windowTitleButtonWidth; } +windowTitleButtonSize: size(windowTitleButtonWidth, windowTitleHeight); defaultWindowTitle: WindowTitle { - height: 21px; + height: windowTitleHeight; bg: titleBg; bgActive: titleBgActive; fg: titleFg; fgActive: titleFgActive; minimize: IconButton(windowTitleButton) { icon: icon { - { size(24px, 21px), titleButtonBg }, - { "title_button_minimize", titleButtonFg, point(4px, 4px) }, + { windowTitleButtonSize, titleButtonBg }, + { "title_button_minimize", titleButtonFg }, }; iconOver: icon { - { size(24px, 21px), titleButtonBgOver }, - { "title_button_minimize", titleButtonFgOver, point(4px, 4px) }, + { windowTitleButtonSize, titleButtonBgOver }, + { "title_button_minimize", titleButtonFgOver }, }; } minimizeIconActive: icon { - { size(24px, 21px), titleButtonBgActive }, - { "title_button_minimize", titleButtonFgActive, point(4px, 4px) }, + { windowTitleButtonSize, titleButtonBgActive }, + { "title_button_minimize", titleButtonFgActive }, }; minimizeIconActiveOver: icon { - { size(24px, 21px), titleButtonBgActiveOver }, - { "title_button_minimize", titleButtonFgActiveOver, point(4px, 4px) }, + { windowTitleButtonSize, titleButtonBgActiveOver }, + { "title_button_minimize", titleButtonFgActiveOver }, }; maximize: IconButton(windowTitleButton) { icon: icon { - { size(24px, 21px), titleButtonBg }, - { "title_button_maximize", titleButtonFg, point(4px, 4px) }, + { windowTitleButtonSize, titleButtonBg }, + { "title_button_maximize", titleButtonFg }, }; iconOver: icon { - { size(24px, 21px), titleButtonBgOver }, - { "title_button_maximize", titleButtonFgOver, point(4px, 4px) }, + { windowTitleButtonSize, titleButtonBgOver }, + { "title_button_maximize", titleButtonFgOver }, }; } maximizeIconActive: icon { - { size(24px, 21px), titleButtonBgActive }, - { "title_button_maximize", titleButtonFgActive, point(4px, 4px) }, + { windowTitleButtonSize, titleButtonBgActive }, + { "title_button_maximize", titleButtonFgActive }, }; maximizeIconActiveOver: icon { - { size(24px, 21px), titleButtonBgActiveOver }, - { "title_button_maximize", titleButtonFgActiveOver, point(4px, 4px) }, + { windowTitleButtonSize, titleButtonBgActiveOver }, + { "title_button_maximize", titleButtonFgActiveOver }, }; restoreIcon: icon { - { size(24px, 21px), titleButtonBg }, - { "title_button_restore", titleButtonFg, point(4px, 4px) }, + { windowTitleButtonSize, titleButtonBg }, + { "title_button_restore", titleButtonFg }, }; restoreIconOver: icon { - { size(24px, 21px), titleButtonBgOver }, - { "title_button_restore", titleButtonFgOver, point(4px, 4px) }, + { windowTitleButtonSize, titleButtonBgOver }, + { "title_button_restore", titleButtonFgOver }, }; restoreIconActive: icon { - { size(24px, 21px), titleButtonBgActive }, - { "title_button_restore", titleButtonFgActive, point(4px, 4px) }, + { windowTitleButtonSize, titleButtonBgActive }, + { "title_button_restore", titleButtonFgActive }, }; restoreIconActiveOver: icon { - { size(24px, 21px), titleButtonBgActiveOver }, - { "title_button_restore", titleButtonFgActiveOver, point(4px, 4px) }, + { windowTitleButtonSize, titleButtonBgActiveOver }, + { "title_button_restore", titleButtonFgActiveOver }, }; close: IconButton(windowTitleButtonClose) { icon: icon { - { size(25px, 21px), titleButtonCloseBg }, - { "title_button_close", titleButtonCloseFg, point(5px, 4px) }, + { windowTitleButtonSize, titleButtonCloseBg }, + { "title_button_close", titleButtonCloseFg }, }; iconOver: icon { - { size(25px, 21px), titleButtonCloseBgOver }, - { "title_button_close", titleButtonCloseFgOver, point(5px, 4px) }, + { windowTitleButtonSize, titleButtonCloseBgOver }, + { "title_button_close", titleButtonCloseFgOver }, }; } closeIconActive: icon { - { size(25px, 21px), titleButtonCloseBgActive }, - { "title_button_close", titleButtonCloseFgActive, point(5px, 4px) }, + { windowTitleButtonSize, titleButtonCloseBgActive }, + { "title_button_close", titleButtonCloseFgActive }, }; closeIconActiveOver: icon { - { size(25px, 21px), titleButtonCloseBgActiveOver }, - { "title_button_close", titleButtonCloseFgActiveOver, point(5px, 4px) }, + { windowTitleButtonSize, titleButtonCloseBgActiveOver }, + { "title_button_close", titleButtonCloseFgActiveOver }, }; }