Skip to content

Commit

Permalink
Add resize and reposition of MSYS2 update hints
Browse files Browse the repository at this point in the history
This ensures, that the text is always below the components list and that
it is resized dynamically based to the installer window size.
  • Loading branch information
larskanis committed Oct 6, 2020
1 parent a6add19 commit df3bebb
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions CHANGELOG-2.7.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
### Changed
- Move HTML documentation to optional install component "Ruby RI and HTML documentation".
- Update to OpenSSL-1.1.1g, libffi-3.3 and gcc-10.2.
- Update to InnoSetup-6 which enables a larger and resizable installer window.
- Skip gemspec based package install if dependency is already satisfied. #67
This avoids unwanted/unnecessary up- or downgrades of MSYS2/MINGW packages on "gem install" when a package is already installed and the version meets optional version constraints.
- Update of the SSL CA certificate list.
Expand Down
16 changes: 8 additions & 8 deletions recipes/installer-inno/ri_gui.iss
Original file line number Diff line number Diff line change
Expand Up @@ -138,17 +138,17 @@ begin
{* Add label to components list *}
CompLabel := TLabel.Create(WizardForm);
CompLabel.Parent := WizardForm.SelectComponentsPage;
CompLabel.Left := WizardForm.ComponentsList.Left;
CompLabel.Width := WizardForm.ComponentsList.Width;
WizardForm.ComponentsList.Height := WizardForm.ComponentsList.Height - ScaleY(65);
Page := PageFromID(wpSelectComponents);
CompLabel := TLabel.Create(Page);
CompLabel.Parent := Page.Surface;
CompLabel.Top := WizardForm.ComponentsList.Top + WizardForm.ComponentsList.Height + ScaleY(12);
CompLabel.Width := Page.SurfaceWidth;
CompLabel.Height := ScaleY(40);
CompLabel.Top := WizardForm.ComponentsList.Top + ScaleY(180);
CompLabel.AutoSize := False;
CompLabel.WordWrap := True;
WizardForm.ComponentsList.Height :=
WizardForm.ComponentsList.Height - CompLabel.Height - ScaleY(40);
CompLabel.Anchors := [akLeft, akBottom, akRight];
{* Bypass click event on ComponentsList *}
ComplistPrevClickCheck := WizardForm.ComponentsList.OnClickCheck;
Expand Down

0 comments on commit df3bebb

Please sign in to comment.