scale gutter icons and more scaling tweaks

cesetup/cesetup.coedit

@@ -84,5 +84,5 @@ object CurrentProject: TCENativeProject
     'cesetup.d'
   )
   ConfigurationIndex = 2
-  version = '3.6.0-alpha.1'
+  version = '3.6.0-alpha.2'
 end

cesetup/version.txt

@@ -1 +1 @@
-v3.6.0-alpha.1
+v3.6.0-alpha.2

lazproj/coedit.lpi

@@ -13,7 +13,7 @@
         <DpiAware Value="True/PM"/>
       </XPManifest>
       <Icon Value="0"/>
-      <Resources Count="354">
+      <Resources Count="364">
         <Resource_0 FileName="..\icons\arrow\arrow_up.png" Type="RCDATA" ResourceName="ARROW_UP"/>
         <Resource_1 FileName="..\icons\arrow\arrow_down.png" Type="RCDATA" ResourceName="ARROW_DOWN"/>
         <Resource_2 FileName="..\icons\arrow\arrow_divide.png" Type="RCDATA" ResourceName="ARROW_DIVIDE"/>
@@ -368,6 +368,16 @@
         <Resource_351 FileName="../icons/other/cross.png" Type="RCDATA" ResourceName="CROSS"/>
         <Resource_352 FileName="../icons/other/cross24.png" Type="RCDATA" ResourceName="CROSS24"/>
         <Resource_353 FileName="../icons/other/cross32.png" Type="RCDATA" ResourceName="CROSS32"/>
+        <Resource_354 FileName="../icons/other/break_reached32.png" Type="RCDATA" ResourceName="BREAK_REACHED32"/>
+        <Resource_355 FileName="../icons/other/break_reached24.png" Type="RCDATA" ResourceName="BREAK_REACHED24"/>
+        <Resource_356 FileName="../icons/other/break_set32.png" Type="RCDATA" ResourceName="BREAK_SET32"/>
+        <Resource_357 FileName="../icons/other/break_set24.png" Type="RCDATA" ResourceName="BREAK_SET24"/>
+        <Resource_358 FileName="../icons/other/indent_more.png" Type="RCDATA" ResourceName="INDENT_MORE"/>
+        <Resource_359 FileName="../icons/other/indent_more24.png" Type="RCDATA" ResourceName="INDENT_MORE24"/>
+        <Resource_360 FileName="../icons/other/indent_more32.png" Type="RCDATA" ResourceName="INDENT_MORE32"/>
+        <Resource_361 FileName="../icons/other/indent_less32.png" Type="RCDATA" ResourceName="INDENT_LESS32"/>
+        <Resource_362 FileName="../icons/other/indent_less24.png" Type="RCDATA" ResourceName="INDENT_LESS24"/>
+        <Resource_363 FileName="../icons/other/indent_less.png" Type="RCDATA" ResourceName="INDENT_LESS"/>
       </Resources>
     </General>
     <i18n>

src/ce_gdb.lfm

@@ -37,15 +37,15 @@ inherited CEGdbWidget: TCEGdbWidget
           Width = 517
           Align = alClient
           Caption = 'CPU'
-          ClientHeight = 162
-          ClientWidth = 515
+          ClientHeight = 161
+          ClientWidth = 513
           TabOrder = 0
           object cpuViewer: TTIPropertyGrid
             Left = 0
-            Height = 162
+            Height = 161
             Hint = 'cpu registers'
             Top = 0
-            Width = 515
+            Width = 513
             Align = alClient
             CheckboxForBoolean = True
             DefaultValueFont.Color = clWindowText
@@ -82,8 +82,8 @@ inherited CEGdbWidget: TCEGdbWidget
             ClientWidth = 511
             object lstVariables: TListView
               Left = 2
-              Height = 136
-              Top = 27
+              Height = 132
+              Top = 31
               Width = 507
               Align = alClient
               AutoWidthLastColumn = True
@@ -109,7 +109,7 @@ inherited CEGdbWidget: TCEGdbWidget
             end
             object varListFlt: TListViewFilterEdit
               Left = 2
-              Height = 23
+              Height = 27
               Hint = 'locate variables'
               Top = 2
               Width = 507
@@ -311,9 +311,9 @@ inherited CEGdbWidget: TCEGdbWidget
           ClientWidth = 511
           object dbgeeOptsEd: TTIPropertyGrid
             Left = 2
-            Height = 165
+            Height = 161
             Top = 2
-            Width = 509
+            Width = 507
             Align = alClient
             BorderSpacing.Around = 2
             CheckboxForBoolean = True

src/ce_gdb.pas

@@ -1195,6 +1195,7 @@ begin
   TCEListViewCopyMenu.create(lstThreads);
 
   cpuViewer.DefaultItemHeight := scaleY(22, 96);
+  dbgeeOptsEd.DefaultItemHeight:= cpuViewer.DefaultItemHeight;
 
   Case GetIconScaledSize of
     iss16:
@@ -1247,7 +1248,6 @@ var
   mnu: ICEMainMenu;
   itm: TMenuItem;
   bmp: TBitmap;
-  i: integer;
 begin
   mnu := getMainMenu;
   if not assigned(mnu) then
@@ -1270,8 +1270,7 @@ begin
   fMenu.Add(itm);
   btnStart.toBitmap(bmp);
   itm.Bitmap.Assign(bmp);
-  i := fMenu.GetImageList.Add(bmp, nil);
-  itm.ImageIndex:= i;
+  itm.ImageIndex:= fMenu.GetImageList.Add(bmp, nil);
 
   itm := TMenuItem.Create(fMenu);
   itm.ShortCut:=fOptions.shortcuts.stop;
@@ -1281,8 +1280,7 @@ begin
   fMenu.Add(itm);
   btnStop.toBitmap(bmp);
   itm.Bitmap.Assign(bmp);
-  i := fMenu.GetImageList.Add(bmp, nil);
-  itm.ImageIndex:= i;
+  itm.ImageIndex:= fMenu.GetImageList.Add(bmp, nil);
 
   itm := TMenuItem.Create(fMenu);
   itm.ShortCut:=fOptions.shortcuts.pause;
@@ -1292,8 +1290,7 @@ begin
   fMenu.Add(itm);
   btnPause.toBitmap(bmp);
   itm.Bitmap.Assign(bmp);
-  i := fMenu.GetImageList.Add(bmp, nil);
-  itm.ImageIndex:= i;
+  itm.ImageIndex:= fMenu.GetImageList.Add(bmp, nil);
 
   itm := TMenuItem.Create(fMenu);
   itm.ShortCut:=fOptions.shortcuts.continue;
@@ -1303,8 +1300,7 @@ begin
   fMenu.Add(itm);
   btnContinue.toBitmap(bmp);
   itm.Bitmap.Assign(bmp);
-  i := fMenu.GetImageList.Add(bmp, nil);
-  itm.ImageIndex:= i;
+  itm.ImageIndex:= fMenu.GetImageList.Add(bmp, nil);
 
   itm := TMenuItem.Create(fMenu);
   itm.ShortCut:=fOptions.shortcuts.step;
@@ -1314,8 +1310,7 @@ begin
   fMenu.Add(itm);
   btnNext.toBitmap(bmp);
   itm.Bitmap.Assign(bmp);
-  i := fMenu.GetImageList.Add(bmp, nil);
-  itm.ImageIndex:= i;
+  itm.ImageIndex:= fMenu.GetImageList.Add(bmp, nil);
 
   itm := TMenuItem.Create(fMenu);
   itm.ShortCut:=fOptions.shortcuts.stepOver;
@@ -1325,8 +1320,7 @@ begin
   fMenu.Add(itm);
   btnOver.toBitmap(bmp);
   itm.Bitmap.Assign(bmp);
-  i := fMenu.GetImageList.Add(bmp, nil);
-  itm.ImageIndex:= i;
+  itm.ImageIndex:= fMenu.GetImageList.Add(bmp, nil);
 
   itm := TMenuItem.Create(fMenu);
   itm.Caption:= '-';
@@ -1341,8 +1335,7 @@ begin
   fMenu.Add(itm);
   btnReg.toBitmap(bmp);
   itm.Bitmap.Assign(bmp);
-  i := fMenu.GetImageList.Add(bmp, nil);
-  itm.ImageIndex:= i;
+  itm.ImageIndex:= fMenu.GetImageList.Add(bmp, nil);
 
   itm := TMenuItem.Create(fMenu);
   itm.ShortCut:=fOptions.shortcuts.updateStack;
@@ -1352,8 +1345,7 @@ begin
   fMenu.Add(itm);
   btnStack.toBitmap(bmp);
   itm.Bitmap.Assign(bmp);
-  i := fMenu.GetImageList.Add(bmp, nil);
-  itm.ImageIndex:= i;
+  itm.ImageIndex:= fMenu.GetImageList.Add(bmp, nil);
 
   itm := TMenuItem.Create(fMenu);
   itm.ShortCut:=fOptions.shortcuts.updateVariables;
@@ -1363,8 +1355,7 @@ begin
   fMenu.Add(itm);
   btnVariables.toBitmap(bmp);
   itm.Bitmap.Assign(bmp);
-  i := fMenu.GetImageList.Add(bmp, nil);
-  itm.ImageIndex:= i;
+  itm.ImageIndex:= fMenu.GetImageList.Add(bmp, nil);
 
   bmp.Free;
 end;

src/ce_infos.pas

@@ -61,13 +61,13 @@ begin
   Inherited create(TheOwner);
   Align  := alTop;
   height :=  ScaleY(26, 96);
-  width := ScaleX(200, 96);
+  width := ScaleX(220, 96);
   //
   fLabel := TLabel.Create(self);
   fLabel.AutoSize:=false;
   fLabel.Parent := self;
   fLabel.Align:= alLeft;
-  fLabel.Width:= ScaleX(70, 96);
+  fLabel.Width:= ScaleX(90, 96);
   fLabel.BorderSpacing.Around := 2;
   fLabel.Hint:= description;
   fLabel.ShowHint:=true;
@@ -251,7 +251,7 @@ begin
   itm.Parent := boxTools;
   itm.ReAlign;
   //
-  Height := boxTools.ControlCount * ScaleY(30, 96) + GroupBox1.Height + ScaleY(12, 96);
+  Height := boxTools.ControlCount * ScaleY(30, 96) + GroupBox1.Height + ScaleY(20, 96);
   Realign;
 end;
 

src/ce_main.pas

@@ -1413,6 +1413,14 @@ begin
   actProjRun.ImageIndex:= i;
   actProjRunWithArgs.ImageIndex:= i;
 
+  i := loadIcon('LAYOUT');
+  mnuLayout.ImageIndex:= i;
+
+  i := LoadIcon('INDENT_MORE');
+  actEdIndent.ImageIndex:= i;
+
+  i := LoadIcon('INDENT_LESS');
+  actEdUnIndent.ImageIndex:= i;
 end;
 
 procedure TCEMainForm.InitWidgets;
@@ -1420,6 +1428,7 @@ var
   widg: TCEWidget;
   act: TAction;
   itm: TMenuItem;
+  idx: integer;
 begin
   fWidgList   := TCEWidgetList.Create;
   fMesgWidg   := TCEMessagesWidget.create(self);
@@ -1468,6 +1477,12 @@ begin
 
   fWidgList.sort(@CompareWidgCaption);
 
+  case GetIconScaledSize of
+    iss16: idx := fImages.AddResourceName(HINSTANCE, 'APPLICATION');
+    iss24: idx := fImages.AddResourceName(HINSTANCE, 'APPLICATION24');
+    iss32: idx := fImages.AddResourceName(HINSTANCE, 'APPLICATION32');
+  end;
+
   for widg in fWidgList do
   begin
     act := TAction.Create(self);
@@ -1475,7 +1490,7 @@ begin
     act.Caption := widg.Caption;
     act.OnExecute := @widgetShowFromAction;
     act.Tag := ptrInt(widg);
-    act.ImageIndex := 25;
+    act.ImageIndex := idx;
     act.OnUpdate:= @updateWidgetMenuEntry;
     itm := TMenuItem.Create(self);
     itm.Action := act;

src/ce_projgroup.lfm

@@ -19,7 +19,7 @@ inherited CEProjectGroupWidget: TCEProjectGroupWidget
       ClientWidth = 328
       object lstProj: TListView[0]
         Left = 4
-        Height = 117
+        Height = 126
         Top = 4
         Width = 320
         Align = alClient
@@ -29,22 +29,22 @@ inherited CEProjectGroupWidget: TCEProjectGroupWidget
           item
             AutoSize = True
             Caption = 'Name'
-            Width = 68
+            Width = 49
           end        
           item
             AutoSize = True
             Caption = 'Type'
-            Width = 56
+            Width = 40
           end        
           item
             AutoSize = True
             Caption = 'Async'
-            Width = 70
+            Width = 49
           end        
           item
             AutoSize = True
             Caption = 'Configuration'
-            Width = 147
+            Width = 180
           end>
         GridLines = True
         ReadOnly = True
@@ -56,19 +56,19 @@ inherited CEProjectGroupWidget: TCEProjectGroupWidget
       end
       object Panel2: TPanel[1]
         Left = 4
-        Height = 32
-        Top = 125
+        Height = 23
+        Top = 134
         Width = 320
         Align = alBottom
         AutoSize = True
         BorderSpacing.Around = 4
         BevelOuter = bvNone
-        ClientHeight = 32
+        ClientHeight = 23
         ClientWidth = 320
         TabOrder = 1
         object btnFreeFocus: TSpeedButton
           Left = 312
-          Height = 32
+          Height = 23
           Hint = 'Put the focus on the ungrouped project'
           Top = 0
           Width = 4
@@ -80,7 +80,7 @@ inherited CEProjectGroupWidget: TCEProjectGroupWidget
         end
         object StaticText1: TStaticText
           Left = 2
-          Height = 28
+          Height = 19
           Top = 2
           Width = 308
           Align = alClient
@@ -91,7 +91,7 @@ inherited CEProjectGroupWidget: TCEProjectGroupWidget
         end
         object btnAddUnfocused: TSpeedButton
           Left = 316
-          Height = 32
+          Height = 23
           Hint = 'Put the ungrouped project in the group'
           Top = 0
           Width = 4

src/ce_synmemo.pas

@@ -811,6 +811,8 @@ end;
 
 {$REGION Standard Obj and Comp -------------------------------------------------}
 constructor TCESynMemo.Create(aOwner: TComponent);
+var
+  z: TIconScaledSize;
 begin
   inherited;
 
@@ -902,14 +904,48 @@ begin
   fModified := false;
   TextBuffer.AddNotifyHandler(senrUndoRedoAdded, @changeNotify);
 
+  Gutter.MarksPart.AutoSize:=false;
+  Gutter.MarksPart.Width := ScaleX(20,96);
   fImages := TImageList.Create(self);
-  fImages.AddResourceName(HINSTANCE, 'BREAK_SET');
-  fImages.AddResourceName(HINSTANCE, 'BULLET_GREEN');
-  fImages.AddResourceName(HINSTANCE, 'BULLET_BLACK');
-  fImages.AddResourceName(HINSTANCE, 'BREAK_REACHED');
-  fImages.AddResourceName(HINSTANCE, 'STEP');
-  fImages.AddResourceName(HINSTANCE, 'CAMERA_GO');
-  fImages.AddResourceName(HINSTANCE, 'WARNING');
+  z := GetIconScaledSize;
+  case z of
+    iss16:
+    begin
+      fImages.Width:= 16;
+      fImages.Height:= 16;
+      fImages.AddResourceName(HINSTANCE, 'BREAK_SET');
+      fImages.AddResourceName(HINSTANCE, 'BULLET_GREEN');
+      fImages.AddResourceName(HINSTANCE, 'BULLET_BLACK');
+      fImages.AddResourceName(HINSTANCE, 'BREAK_REACHED');
+      fImages.AddResourceName(HINSTANCE, 'STEP');
+      fImages.AddResourceName(HINSTANCE, 'CAMERA_GO');
+      fImages.AddResourceName(HINSTANCE, 'WARNING');
+    end;
+    iss24:
+    begin
+      fImages.Width:= 24;
+      fImages.Height:= 24;
+      fImages.AddResourceName(HINSTANCE, 'BREAK_SET24');
+      fImages.AddResourceName(HINSTANCE, 'BULLET_GREEN24');
+      fImages.AddResourceName(HINSTANCE, 'BULLET_BLACK24');
+      fImages.AddResourceName(HINSTANCE, 'BREAK_REACHED24');
+      fImages.AddResourceName(HINSTANCE, 'STEP24');
+      fImages.AddResourceName(HINSTANCE, 'CAMERA_GO24');
+      fImages.AddResourceName(HINSTANCE, 'WARNING24');
+    end;
+    iss32:
+    begin
+      fImages.Width:= 32;
+      fImages.Height:= 32;
+      fImages.AddResourceName(HINSTANCE, 'BREAK_SET32');
+      fImages.AddResourceName(HINSTANCE, 'BULLET_GREEN32');
+      fImages.AddResourceName(HINSTANCE, 'BULLET_BLACK32');
+      fImages.AddResourceName(HINSTANCE, 'BREAK_REACHED32');
+      fImages.AddResourceName(HINSTANCE, 'STEP32');
+      fImages.AddResourceName(HINSTANCE, 'CAMERA_GO32');
+      fImages.AddResourceName(HINSTANCE, 'WARNING32');
+    end;
+  end;
 
   fPositions := TCESynMemoPositions.create(self);
   fMultiDocSubject := TCEMultiDocSubject.create;