From 441f94231ea05d725ed64de03ffa3b3ea619296a Mon Sep 17 00:00:00 2001 From: Hassan Date: Tue, 30 Apr 2019 16:26:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=AF=E8=AE=BE=E7=BD=AE=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E9=98=B4=E5=BD=B1=E5=9B=BE=E7=89=87=E3=80=81=E6=9C=80?= =?UTF-8?q?=E5=B0=8F=E5=8C=96=E3=80=81=E6=9C=80=E5=A4=A7=E5=8C=96=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/template/includes/resetMainWindow.iss | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/template/includes/resetMainWindow.iss b/src/template/includes/resetMainWindow.iss index f2f5510..aaac825 100644 --- a/src/template/includes/resetMainWindow.iss +++ b/src/template/includes/resetMainWindow.iss @@ -16,19 +16,27 @@ begin end; InitFairy(WizardForm.Handle, 0, 20 ); - AddImgToList(-20, -20, 255, clNone, ExpandConstant('{tmp}\shadow.png')) + + if {{ui.closeButton.show}} then begin + AddImgToList(-20, -20, 255, clNone, ExpandConstant('{tmp}\shadow.png')) + end; + ShowFairyEx(0); //window background mainBg:=ImgLoad(WizardForm.Handle, ExpandConstant('{tmp}\bg.png'), 0, 0, ScaleX(WizardForm.ClientWidth), ScaleY(WizardForm.ClientHeight), True, True); //minimize btn - Minimize:=BtnCreate(WizardForm.Handle, ScaleX({{ui.minimizeButton.left}}), ScaleY({{ui.minimizeButton.top}}), ScaleX({{ui.minimizeButton.width}}), ScaleY({{ui.minimizeButton.height}}), ExpandConstant('{tmp}\minimizeBtn.png'), 3, False); - BtnSetEvent(Minimize, BtnClickEventID, WrapBtnCallback(@MinimizeOnClick, 1)); - + if {{ui.minimizeButton.show}} then begin + Minimize:=BtnCreate(WizardForm.Handle, ScaleX({{ui.minimizeButton.left}}), ScaleY({{ui.minimizeButton.top}}), ScaleX({{ui.minimizeButton.width}}), ScaleY({{ui.minimizeButton.height}}), ExpandConstant('{tmp}\minimizeBtn.png'), 3, False); + BtnSetEvent(Minimize, BtnClickEventID, WrapBtnCallback(@MinimizeOnClick, 1)); + end; + //close btn - CloseBtn:=BtnCreate(WizardForm.Handle, ScaleX({{ui.closeButton.left}}), ScaleY({{ui.closeButton.top}}), ScaleX({{ui.closeButton.width}}), ScaleY({{ui.closeButton.height}}), ExpandConstant('{tmp}\closeBtn.png'), 3, False); - BtnSetEvent(CloseBtn, BtnClickEventID, WrapBtnCallback(@CloseBtnOnClick, 1)); + if {{ui.closeButton.show}} then begin + CloseBtn:=BtnCreate(WizardForm.Handle, ScaleX({{ui.closeButton.left}}), ScaleY({{ui.closeButton.top}}), ScaleX({{ui.closeButton.width}}), ScaleY({{ui.closeButton.height}}), ExpandConstant('{tmp}\closeBtn.png'), 3, False); + BtnSetEvent(CloseBtn, BtnClickEventID, WrapBtnCallback(@CloseBtnOnClick, 1)); + end; ImgApplyChanges(WizardForm.Handle); end; @@ -36,4 +44,4 @@ end; procedure setEnableCloseBtn(isEnabled:Boolean); begin BtnSetEnabled(CloseBtn, isEnabled); -end; \ No newline at end of file +end; From 8891ba16a35e2064f7f8c337f8dcca126059593e Mon Sep 17 00:00:00 2001 From: Hassan Date: Tue, 30 Apr 2019 16:37:09 +0800 Subject: [PATCH 2/2] Update resetMainWindow.iss --- src/template/includes/resetMainWindow.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/template/includes/resetMainWindow.iss b/src/template/includes/resetMainWindow.iss index aaac825..a6338d2 100644 --- a/src/template/includes/resetMainWindow.iss +++ b/src/template/includes/resetMainWindow.iss @@ -17,7 +17,7 @@ begin InitFairy(WizardForm.Handle, 0, 20 ); - if {{ui.closeButton.show}} then begin + if {{ui.shadowBg.show}} then begin AddImgToList(-20, -20, 255, clNone, ExpandConstant('{tmp}\shadow.png')) end;