spktoolbar: improved internal layout of small buttons

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5984 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/spktoolbar/SpkToolbar/spkt_Buttons.pas

@@ -1234,12 +1234,12 @@ begin
   // Text
   if FButtonKind in [bkButton, bkToggle] then
   begin
-    // £amiemy etykietê
+    // Label
     FindBreakPlace(FCaption,BreakPos,RowWidth);
     TextWidth := 2 * LargeButtonCaptionHMargin + RowWidth;
   end else
   begin
-    // Nie ³amiemy etykiety
+    // do not break the label
     Bitmap.Canvas.Font.Assign(FAppearance.Element.CaptionFont);
     SpkScaleFont(Bitmap.Canvas.Font);
     TextWidth := 2 * LargeButtonCaptionHMargin + Bitmap.Canvas.TextWidth(FCaption);

components/spktoolbar/SpkToolbar/spkt_Const.pas

@@ -28,7 +28,7 @@ const
   // ****************
 
   LARGEBUTTON_DROPDOWN_FIELD_SIZE = 29;
-  LARGEBUTTON_GLYPH_MARGIN = 1;
+  LARGEBUTTON_GLYPH_MARGIN = 2;
   LARGEBUTTON_CAPTION_HMARGIN = 3;
   LARGEBUTTON_MIN_WIDTH = 24;
   LARGEBUTTON_RADIUS = 4;
@@ -40,7 +40,7 @@ const
   SMALLBUTTON_GLYPH_WIDTH = 16; //was: 20; //16;
   SMALLBUTTON_BORDER_WIDTH = 2;
   SMALLBUTTON_HALF_BORDER_WIDTH = 1;
-  SMALLBUTTON_PADDING = 2;
+  SMALLBUTTON_PADDING = 4;  // was: 2
   SMALLBUTTON_DROPDOWN_WIDTH = 11;
   SMALLBUTTON_RADIUS = 4;
 

components/spktoolbar/demos/actions/project1.lpi

@@ -7,8 +7,12 @@
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
       <Title Value="project1"/>
+      <Scaled Value="True"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True"/>
+      </XPManifest>
     </General>
     <i18n>
       <EnableI18N LFM="False"/>

components/spktoolbar/demos/actions/project1.lpr

@@ -7,12 +7,15 @@ uses
   cthreads,
   {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, Unit1, Unit2
+  LCLVersion, Forms, Unit1, Unit2
   { you can add units after this };
 
 {$R *.res}
 
 begin
+  {$IF lcl_fullversion >= 1080000}
+  Application.Scaled := True;
+  {$ENDIF}
   RequireDerivedFormResource := True;
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);

components/spktoolbar/demos/actions/unit1.lfm

@@ -9,7 +9,7 @@ object Form1: TForm1
   Menu = MainMenu
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
-  LCLVersion = '1.6.4.0'
+  LCLVersion = '1.9.0.0'
   object ToolBar1: TToolBar
     Left = 0
     Height = 26
@@ -33,73 +33,70 @@ object Form1: TForm1
       Left = 47
       Height = 22
       Top = 0
-      Width = 10
       Caption = 'ToolButton3'
       Style = tbsDivider
     end
     object ToolButton4: TToolButton
-      Left = 57
+      Left = 52
       Top = 0
       Action = AcEditCut
     end
     object ToolButton5: TToolButton
-      Left = 80
+      Left = 75
       Top = 0
       Action = AcEditCopy
     end
     object ToolButton6: TToolButton
-      Left = 103
+      Left = 98
       Top = 0
       Action = AcEditPaste
     end
     object ToolButton7: TToolButton
-      Left = 126
+      Left = 121
       Height = 22
       Top = 0
-      Width = 10
       Caption = 'ToolButton7'
       Style = tbsDivider
     end
     object ToolButton8: TToolButton
-      Left = 282
+      Left = 269
       Top = 0
       Action = AcQuit
     end
     object ToolButton9: TToolButton
-      Left = 136
+      Left = 126
       Top = 0
       Action = AcBold
     end
     object ToolButton10: TToolButton
-      Left = 159
+      Left = 149
       Top = 0
       Action = AcItalic
     end
     object ToolButton11: TToolButton
-      Left = 205
+      Left = 195
       Top = 0
       Action = AcLeftJustify
     end
     object ToolButton12: TToolButton
-      Left = 182
+      Left = 172
       Top = 0
       Action = AcUnderline
     end
     object ToolButton13: TToolButton
-      Left = 228
+      Left = 218
       Top = 0
       Action = AcCenter
     end
     object ToolButton14: TToolButton
-      Left = 251
+      Left = 241
       Top = 0
       Action = AcRightJustify
     end
     object ToolButton15: TToolButton
-      Left = 274
+      Left = 264
       Height = 22
       Top = 0
-      Width = 8
       Caption = 'ToolButton15'
       Style = tbsDivider
     end
@@ -164,7 +161,7 @@ object Form1: TForm1
     Appearance.Element.ActiveInnerDarkColor = 961020
     Appearance.Element.ActiveCaptionColor = 8405614
     Appearance.Element.Style = esRounded
-    TabIndex = 0
+    TabIndex = 4
     Images = ImageList
     LargeImages = LargeImageList
     Tabs = (
@@ -681,7 +678,7 @@ object Form1: TForm1
         'SpkPane4'
       )
       object SpkPane4: TSpkPane
-        Caption = 'Pane'
+        Caption = 'Info'
         Visible = True
         Items = (
           'SpkLargeButton4'