Merge pull request #50 from bgrabitmap/dev-bgracontrols

Dev bgracontrols

bccombobox.pas

@@ -114,7 +114,7 @@ procedure Register;
 
 implementation
 
-uses math, LCLType, PropEdits;
+uses math, LCLType, PropEdits, BGRAText;
 
 procedure Register;
 begin
@@ -152,13 +152,15 @@ begin
     FForm.Color := FDropDownBorderColor;
     FListBox.Font.Name := Button.StateNormal.FontEx.Name;
     FListBox.Font.Style := Button.StateNormal.FontEx.Style;
-    FListBox.Font.Height := Button.StateNormal.FontEx.Height;
-    FListBox.Canvas.Font.Assign(FListBox.Font);
+    FListBox.Font.Height := FontEmHeightSign*Button.StateNormal.FontEx.Height;
+    self.Canvas.Font.Assign(FListBox.Font);
     if Assigned(FOnDrawItem) and (FItemHeight <> 0) then
-      h := FItemHeight else h := FListBox.Canvas.GetTextHeight('Hg');
+      h := FItemHeight else h := self.Canvas.GetTextHeight('Hg');
+    {$IFDEF WINDOWS}inc(h,6);{$ENDIF}
     FListBox.ItemHeight := h;
+    {$IFDEF LINUX}inc(h,6);{$ENDIF}
     FForm.ClientWidth := FButton.Width;
-    FForm.ClientHeight := (h+6)*min(Items.Count, FDropDownCount) + 2*FDropDownBorderSize;
+    FForm.ClientHeight := h*min(Items.Count, FDropDownCount) + 2*FDropDownBorderSize;
     FListBox.SetBounds(FDropDownBorderSize,FDropDownBorderSize,
       FForm.ClientWidth-2*FDropDownBorderSize,
       FForm.ClientHeight-2*FDropDownBorderSize);

bgracontrols.lpk

@@ -28,7 +28,7 @@
     </CompilerOptions>
     <Description Value="BGRA Controls is a set of graphical UI elements that you can use with Lazarus LCL applications."/>
     <License Value="Modified LGPL"/>
-    <Version Major="6" Minor="4"/>
+    <Version Major="6" Minor="5"/>
     <Files Count="56">
       <Item1>
         <Filename Value="bcbasectrls.pas"/>

bgracontrolsinfo.pas

@@ -8,7 +8,7 @@ uses
   Classes, SysUtils;
 
 const
-  BGRAControlsVersion = 6040000;
+  BGRAControlsVersion = 6050000;
 
   function BGRAControlsVersionStr: string;
 

bgrapascalscriptcomponent.lpk

@@ -11,7 +11,7 @@
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
     </CompilerOptions>
-    <Version Major="6" Minor="4"/>
+    <Version Major="6" Minor="5"/>
     <Files Count="3">
       <Item1>
         <Filename Value="bgrapascalscript.pas"/>

update_bgracontrols_force.json

@@ -8,13 +8,13 @@
       "ForceNotify" : true,
       "InternalVersion" : 25,
       "Name" : "bgracontrols.lpk",
-      "Version" : "6.4.0.0"
+      "Version" : "6.5.0.0"
     },
     {
       "ForceNotify" : false,
       "InternalVersion" : 1,
       "Name" : "bgrapascalscriptcomponent.lpk",
-      "Version" : "6.4.0.0"
+      "Version" : "6.5.0.0"
     }
   ]
 }