Browse Source

Try to fix tbStatusToolBar for MacOS X

maciej-izak 7 years ago
parent
commit
d90720319f
2 changed files with 16 additions and 30 deletions
  1. 16 14
      Units/Forms/UFRMMainForm.lfm
  2. 0 16
      Units/Forms/UFRMMainForm.pas

+ 16 - 14
Units/Forms/UFRMMainForm.lfm

@@ -1,10 +1,10 @@
 object FRMMainForm: TFRMMainForm
 object FRMMainForm: TFRMMainForm
-  Left = 168
+  Left = 231
   Height = 600
   Height = 600
-  Top = 12
+  Top = 44
   Width = 865
   Width = 865
   Caption = 'Pascal Coin Wallet, JSON-RPC Miner & Explorer'
   Caption = 'Pascal Coin Wallet, JSON-RPC Miner & Explorer'
-  ClientHeight = 580
+  ClientHeight = 600
   ClientWidth = 865
   ClientWidth = 865
   Color = clBtnFace
   Color = clBtnFace
   Constraints.MinHeight = 600
   Constraints.MinHeight = 600
@@ -45,7 +45,7 @@ object FRMMainForm: TFRMMainForm
   end
   end
   object paSyncPanel: TPanel
   object paSyncPanel: TPanel
     Left = 0
     Left = 0
-    Height = 477
+    Height = 505
     Top = 80
     Top = 80
     Width = 865
     Width = 865
     Align = alClient
     Align = alClient
@@ -62,7 +62,7 @@ object FRMMainForm: TFRMMainForm
   end
   end
   object paWalletPanel: TPanel
   object paWalletPanel: TPanel
     Left = 0
     Left = 0
-    Height = 477
+    Height = 505
     Top = 80
     Top = 80
     Width = 865
     Width = 865
     Align = alClient
     Align = alClient
@@ -79,8 +79,8 @@ object FRMMainForm: TFRMMainForm
   end
   end
   object sbStatusBar: TStatusBar
   object sbStatusBar: TStatusBar
     Left = 0
     Left = 0
-    Height = 23
-    Top = 557
+    Height = 15
+    Top = 585
     Width = 865
     Width = 865
     Panels = <    
     Panels = <    
       item
       item
@@ -101,17 +101,20 @@ object FRMMainForm: TFRMMainForm
         Width = 30
         Width = 30
       end>
       end>
     SimplePanel = False
     SimplePanel = False
-    OnDrawPanel = sbStatusBarDrawPanel
   end
   end
   object tbStatusToolBar: TToolBar
   object tbStatusToolBar: TToolBar
+    AnchorSideTop.Control = sbStatusBar
+    AnchorSideBottom.Control = sbStatusBar
+    AnchorSideBottom.Side = asrBottom
     Left = 778
     Left = 778
-    Height = 16
-    Top = 544
+    Height = 15
+    Top = 585
     Width = 70
     Width = 70
     Align = alNone
     Align = alNone
-    Anchors = [akRight, akBottom]
+    Anchors = [akTop, akRight, akBottom]
     AutoSize = True
     AutoSize = True
     ButtonHeight = 16
     ButtonHeight = 16
+    ButtonWidth = 23
     Caption = 'tbStatusToolBar'
     Caption = 'tbStatusToolBar'
     EdgeBorders = []
     EdgeBorders = []
     EdgeInner = esNone
     EdgeInner = esNone
@@ -119,7 +122,6 @@ object FRMMainForm: TFRMMainForm
     Images = ilSmallIcons
     Images = ilSmallIcons
     List = True
     List = True
     TabOrder = 0
     TabOrder = 0
-    Visible = False
     Wrapable = False
     Wrapable = False
     object tbtnWalletLock: TToolButton
     object tbtnWalletLock: TToolButton
       Left = 1
       Left = 1
@@ -131,7 +133,7 @@ object FRMMainForm: TFRMMainForm
       OnClick = tbtnWalletLockClick
       OnClick = tbtnWalletLockClick
     end
     end
     object tbtnConnectivity: TToolButton
     object tbtnConnectivity: TToolButton
-      Left = 24
+      Left = 47
       Hint = 'Network is active. Click to deactivate'
       Hint = 'Network is active. Click to deactivate'
       Top = 0
       Top = 0
       Caption = 'Net'
       Caption = 'Net'
@@ -139,7 +141,7 @@ object FRMMainForm: TFRMMainForm
       OnClick = tbtnConnectivityClick
       OnClick = tbtnConnectivityClick
     end
     end
     object tbtnSync: TToolButton
     object tbtnSync: TToolButton
-      Left = 47
+      Left = 24
       Hint = 'Show &Syncronization'
       Hint = 'Show &Syncronization'
       Top = 0
       Top = 0
       Caption = '&Synchronization'
       Caption = '&Synchronization'

+ 0 - 16
Units/Forms/UFRMMainForm.pas

@@ -90,10 +90,8 @@ type
     procedure tbtnSyncClick(Sender: TObject);
     procedure tbtnSyncClick(Sender: TObject);
     procedure tbtnWalletLockClick(Sender:TObject);
     procedure tbtnWalletLockClick(Sender:TObject);
     procedure tbtnConnectivityClick(Sender:TObject);
     procedure tbtnConnectivityClick(Sender:TObject);
-    procedure sbStatusBarDrawPanel(StatusBar: TStatusBar; Panel: TStatusPanel; const Rect: TRect);
     procedure miSeedNodesClick(Sender: TObject);
     procedure miSeedNodesClick(Sender: TObject);
   private
   private
-    __FLastFooterToolBarDrawRect : TRect;  // Required for FPC bug work-around
     FMode : TFRMMainFormMode;
     FMode : TFRMMainFormMode;
     FSyncControl : TCTRLSyncronization;
     FSyncControl : TCTRLSyncronization;
     FWalletControl : TCTRLWallet;
     FWalletControl : TCTRLWallet;
@@ -131,8 +129,6 @@ const
 
 
 procedure TFRMMainForm.FormCreate(Sender: TObject);
 procedure TFRMMainForm.FormCreate(Sender: TObject);
 begin
 begin
-  tbStatusToolBar.Parent := sbStatusBar;
-  __FLastFooterToolBarDrawRect := TRect.Empty;
   CloseAction := caNone; // Will handle terminate in separate method
   CloseAction := caNone; // Will handle terminate in separate method
   FMode := wmSync;
   FMode := wmSync;
   FSyncControl := TCTRLSyncronization.Create(self);
   FSyncControl := TCTRLSyncronization.Create(self);
@@ -395,18 +391,6 @@ begin
   TUserInterface.ShowSyncDialog;
   TUserInterface.ShowSyncDialog;
 end;
 end;
 
 
-procedure TFRMMainForm.sbStatusBarDrawPanel(StatusBar: TStatusBar; Panel: TStatusPanel; const Rect: TRect);
-begin
-  if __FLastFooterToolBarDrawRect = Rect then exit; // avoid FPC bug: triggers infinite draw refresh on windows
-  if Panel = sbStatusBar.Panels[3] then
-    with tbStatusToolBar do begin
-      Top := Rect.Top + (Rect.Height - tbStatusToolBar.Height) div 2;
-      Left := Rect.Right - tbStatusToolBar.Width - CT_FOOTER_TOOLBAR_RIGHT_PADDING;
-      Visible := true;
-    end;
-  __FLastFooterToolBarDrawRect := Rect;
-end;
-
 {%endregion}
 {%endregion}
 
 
 end.
 end.