Changeset 465

Timestamp:

Feb 22, 2023, 1:45:24 AM (2 years ago)

Author:

ataylor

Message:

Finish(?) implementing scale-to-font logic for NewView dialogs.

Location:

trunk

Files:

• . (modified) (1 prop)
• NewView/FileDialogForm.pas (modified) (4 diffs)
• NewView/GlobalSearchForm.pas (modified) (1 diff)
• NewView/MainForm.pas (modified) (4 diffs)
• NewView/PrintDialogUnit.pas (modified) (1 diff)
• NewView/SearchDirectoriesFormUnit.pas (modified) (1 diff)
• NewView/VersionUnit.pas (modified) (1 diff)
• NewView/newview.scu (modified) ( previous)

trunk

@@ -1 +1 @@
 [Ee][Nn][Vv].[Ii][Nn][Cc]
+*.[Bb][Aa][Kk]

@@ -1 +1 @@
 [Ee][Nn][Vv].[Ii][Nn][Cc]
+*.[Bb][Aa][Kk]

trunk/NewView/FileDialogForm.pas

@@ -150 +150 @@
 Procedure TFileDialogForm.FileDialogFormOnSetupShow (Sender: TObject);
 Begin
-  ScaleForm( self, 11, 16 );
+  ScaleForm( self, 10, 16 );
+
+  // ScaleForm seems to misposition the combo-boxes, so we fix that here
+  DriveComboBox.Bottom := DrivesLabel.Bottom - DriveComboBox.Height;
+  FilterComboBox.Bottom := FilterLabel.Bottom - FilterComboBox.Height;
 
   FileNameEdit.YAlign := yaTop;
@@ -163 +167 @@
   DriveComboBox.YAlign := yaTop;
   DrivesLabel.YAlign := yaTop;
+
   DirectoryListBox.YStretch := ysFrame;
   DirectoriesLabel.YAlign := yaTop;
@@ -171 +176 @@
 
   LayoutControls;
+  FileListBox.SetColumnWidth( 0, Canvas.TextWidth('A_Suitably_Long_FileName.EXT'));
+
 End;
 
@@ -366 +373 @@
   SplitX := round( ClientWidth * Split );
   LeftPaneWidth := SplitX - 8; // note we are not including borders here
-  RightPaneWidth := ClientWidth - SplitX - 8;
-  RightPaneX := SplitX + 3;
+  RightPaneWidth := ClientWidth - SplitX - 9;
+  RightPaneX := SplitX + 4;
 
   DrivesLabel.Width := LeftPaneWidth;

trunk/NewView/GlobalSearchForm.pas

@@ -301 +301 @@
 Procedure TGlobalSearchForm.GlobalSearchFormOnSetupShow (Sender: TObject);
 Begin
-  ScaleForm( self, 11, 16 );
+  ScaleForm( self, 8, 16 );
+  // Fix scaling issues on some controls
+  if SearchTextLabel1.Top > (SearchLocationComboBox.Top + 2) then
+    SearchTextLabel1.Top := SearchLocationComboBox.Top + 2;
+  Bevel.Bottom := ClientHeight - ResultsLabel.Top + 4;
+  Led.Height := ResultsLabel.Height;
+  Led.Width := Led.Height;
+  Led.Top := ResultsLabel.Top;
+
   SearchButton.Align := alFixedRightTop;
 

trunk/NewView/MainForm.pas

@@ -3889 +3889 @@
   ContentsOutline.SmoothScroll := false;
 
-  LogEvent(LogStartup, 'Choosing default font: Trying WarpSans');
+  LogEvent(LogStartup, 'Choosing default font: Trying Window Text setting');
 
   Font := GetNiceDefaultFont;
@@ -4386 +4386 @@
   StatusPanel.Left:= 0;
   StatusPanel.Width:= ClientWidth div 2 - 2;
-  StatusPanel.Height := TextHeight + 2;
+  StatusPanel.Height := TextHeight + Font.InternalLeading + 4;
 
   ProgressPanel.Left:= ClientWidth div 2 + 2;
   ProgressPanel.Width:= ClientWidth - ProgressPanel.Left;
-  ProgressPanel.Height := TextHeight + 2;
+  ProgressPanel.Height := TextHeight + Font.InternalLeading + 4;
 
   Notebook.Bottom := StatusPanel.Height + 3;
@@ -4965 +4965 @@
 
 Procedure TMainForm.NotebookOnSetupShow (Sender: TObject);
-Begin
+var
+  btnWidth: integer;
+  btnHeight: integer;
+Begin
+  btnWidth := Canvas.TextWidth('M') * 8;
+  btnHeight := trunc( Canvas.TextHeight('M') * 1.5 );
+
+  DeleteNoteButton.Width := btnWidth;
+  DeleteNoteButton.Height := btnHeight;
+  GotoNoteButton.Width := btnWidth;
+  GotoNoteButton.Height := btnHeight;
+  GotoNoteButton.Left := btnWidth + 10;
+  AddNoteButton.Width := btnWidth;
+  AddNoteButton.Height := btnHeight;
+  AddNoteButton.Bottom := btnHeight + 5;
+  EditNoteButton.Width := btnWidth;
+  EditNoteButton.Height := btnHeight;
+  EditNoteButton.Left := btnWidth + 10;
+  EditNoteButton.Bottom := btnHeight + 5;
+
   ContentsOutline.xStretch := xsFrame;
   ContentsOutline.yStretch := ysFrame;
@@ -4980 +4999 @@
   SearchResultsListBox.xStretch := xsFrame;
   SearchResultsListBox.yStretch := ysFrame;
+
+  NotesListBox.Bottom := 2 * btnHeight + 10;
+  NotesListBox.Height := Notebook.ClientHeight - NotesListBox.Bottom;
 
   NotesListBox.xStretch := xsFrame;

trunk/NewView/PrintDialogUnit.pas

@@ -65 +65 @@
 Procedure TNewViewPrintDialog.NewViewPrintDialogOnSetupShow (Sender: TObject);
 Begin
-  ScaleForm( self, 11, 16 );
+  ScaleForm( self, 8, 16 );
+  // ScaleForm seems to misposition the combo-box, so fix it here
+  PrinterComboBox.Bottom := PrinterLabel.Bottom - PrinterComboBox.Height - 1;
 End;
 

trunk/NewView/SearchDirectoriesFormUnit.pas

@@ -58 +58 @@
 Procedure TSearchDirectoriesForm.SearchDirectoriesFormOnSetupShow (Sender: TObject);
 Begin
-  ScaleForm( self, 11, 16 );
+  ScaleForm( self, 8, 16 );
 End;
 

trunk/NewView/VersionUnit.pas

@@ -17 +17 @@
 
 const
-  Version =        'V2.19.7'; // $SS_REQUIRE_NEW_VERSION$
+  Version =        'V2.19.7a'; // $SS_REQUIRE_NEW_VERSION$
   BldLevelVersion = '2.19.7'; // Embedded for IBM BLDLEVEL tool
   CopyrightMsg = 'Copyright 2005 Aaron Lawrence; 2006-2019 Ronald Brill';

@@ -1 +1 @@
 [Ee][Nn][Vv].[Ii][Nn][Cc]
+*.[Bb][Aa][Kk]