・ウィンドウサイズや解像度を変更した時に

　ツールバーの位置がずれてしまう問題が再発していたので修正。

diff --git a/Giko.dfm b/Giko.dfm
index 67ab328..8e02632 100644 (file)
--- a/Giko.dfm
+++ b/Giko.dfm
@@ -1,12 +1,12 @@
 object GikoForm: TGikoForm
-  Left = 129
-  Top = 179
+  Left = 115
+  Top = 0
   HorzScrollBar.Visible = False
   VertScrollBar.Visible = False
   AutoScroll = False
   Caption = '-'
   ClientHeight = 566
-  ClientWidth = 702
+  ClientWidth = 696
   Color = clBtnFace
   Font.Charset = SHIFTJIS_CHARSET
   Font.Color = clWindowText
@@ -30,7 +30,7 @@ object GikoForm: TGikoForm
   object StatusBar: TStatusBar
     Left = 0
     Top = 546
-    Width = 702
+    Width = 696
     Height = 20
     Panels = <
       item
@@ -48,7 +48,7 @@ object GikoForm: TGikoForm
   object MainPanel: TPanel
     Left = 0
     Top = 77
-    Width = 702
+    Width = 696
     Height = 469
     Align = alClient
     BevelOuter = bvNone
@@ -56,7 +56,7 @@ object GikoForm: TGikoForm
     object MessageSplitter: TSplitter
       Left = 0
       Top = 430
-      Width = 702
+      Width = 696
       Height = 5
       Cursor = crVSplit
       Align = alBottom
@@ -67,7 +67,7 @@ object GikoForm: TGikoForm
     object ClientPanel: TPanel
       Left = 0
       Top = 0
-      Width = 702
+      Width = 696
       Height = 430
       Align = alClient
       BevelOuter = bvNone
@@ -160,7 +160,7 @@ object GikoForm: TGikoForm
           object ToolBar1: TToolBar
             Left = 2
             Top = 4
-            Width = 16
+            Width = 15
             Height = 18
             Align = alNone
             AutoSize = True
@@ -271,7 +271,7 @@ object GikoForm: TGikoForm
       object ThreadMainPanel: TPanel
         Left = 150
         Top = 0
-        Width = 552
+        Width = 546
         Height = 430
         Align = alClient
         BevelOuter = bvNone
@@ -279,7 +279,7 @@ object GikoForm: TGikoForm
         object ListSplitter: TSplitter
           Left = 0
           Top = 189
-          Width = 552
+          Width = 546
           Height = 5
           Cursor = crVSplit
           Align = alTop
@@ -292,7 +292,7 @@ object GikoForm: TGikoForm
         object ViewPanel: TPanel
           Left = 0
           Top = 0
-          Width = 552
+          Width = 546
           Height = 189
           Align = alTop
           BevelOuter = bvNone
@@ -300,7 +300,7 @@ object GikoForm: TGikoForm
           object ListView: TGikoListView
             Left = 0
             Top = 53
-            Width = 552
+            Width = 546
             Height = 136
             Align = alClient
             Columns = <>
@@ -332,7 +332,7 @@ object GikoForm: TGikoForm
           object ListCoolBar: TGikoCoolBar
             Left = 0
             Top = 0
-            Width = 552
+            Width = 546
             Height = 24
             AutoSize = True
             BandMaximize = bmDblClick
@@ -349,7 +349,7 @@ object GikoForm: TGikoForm
                 Control = ListNameToolBar
                 ImageIndex = -1
                 MinHeight = 18
-                Width = 41
+                Width = 35
               end>
             EdgeBorders = [ebLeft, ebTop, ebRight]
             EdgeInner = esLowered
@@ -426,7 +426,7 @@ object GikoForm: TGikoForm
               object SelectComboBox: TComboBox
                 Tag = 1
                 Left = 194
-                Top = 1
+                Top = 0
                 Width = 127
                 Height = 20
                 Hint = #12473#12524#12483#12489#12434#26908#32034#12377#12427#12395#12399#12371#12371#12395#35486#21477#12434#20837#21147#12375#12414#12377
@@ -500,7 +500,7 @@ object GikoForm: TGikoForm
             object ListNameToolBar: TToolBar
               Left = 516
               Top = 2
-              Width = 28
+              Width = 22
               Height = 18
               AutoSize = True
               ButtonHeight = 16
@@ -541,7 +541,7 @@ object GikoForm: TGikoForm
           object TmpToolBar: TToolBar
             Left = 0
             Top = 24
-            Width = 552
+            Width = 546
             Height = 29
             Caption = 'TmpToolBar'
             TabOrder = 2
@@ -551,7 +551,7 @@ object GikoForm: TGikoForm
         object ThreadPanel: TPanel
           Left = 0
           Top = 194
-          Width = 552
+          Width = 546
           Height = 236
           Align = alClient
           BevelOuter = bvNone
@@ -559,7 +559,7 @@ object GikoForm: TGikoForm
           object BrowserBottomPanel: TGikoPanel
             Left = 0
             Top = 216
-            Width = 552
+            Width = 546
             Height = 20
             Align = alBottom
             BevelEdges = [beLeft, beRight, beBottom]
@@ -571,7 +571,7 @@ object GikoForm: TGikoForm
           object BrowserCoolBar: TGikoCoolBar
             Left = 0
             Top = 0
-            Width = 552
+            Width = 546
             Height = 46
             AutoSize = True
             BandMaximize = bmDblClick
@@ -587,13 +587,13 @@ object GikoForm: TGikoForm
                 Control = BrowserNameToolBar
                 ImageIndex = -1
                 MinHeight = 18
-                Width = 163
+                Width = 157
               end
               item
                 Control = BrowserTabToolBar
                 ImageIndex = -1
                 MinHeight = 20
-                Width = 548
+                Width = 542
               end>
             EdgeBorders = [ebLeft, ebTop, ebRight]
             EdgeInner = esLowered
@@ -727,7 +727,7 @@ object GikoForm: TGikoForm
             object BrowserNameToolBar: TToolBar
               Left = 394
               Top = 2
-              Width = 150
+              Width = 144
               Height = 18
               AutoSize = True
               ButtonHeight = 16
@@ -794,7 +794,7 @@ object GikoForm: TGikoForm
             object BrowserTabToolBar: TToolBar
               Left = 9
               Top = 24
-              Width = 535
+              Width = 529
               Height = 20
               ButtonHeight = 18
               Caption = 'BrowserTabToolBar'
@@ -834,7 +834,7 @@ object GikoForm: TGikoForm
           object Browser: TWebBrowser
             Left = 0
             Top = 46
-            Width = 552
+            Width = 546
             Height = 170
             Align = alClient
             TabOrder = 2
@@ -845,7 +845,7 @@ object GikoForm: TGikoForm
             OnNewWindow2 = BrowserNewWindow2
             OnDocumentComplete = BrowserDocumentComplete
             ControlData = {
-              4C0000000D390000921100000000000000000000000000000000000000000000
+              4C0000006E380000921100000000000000000000000000000000000000000000
               000000004C000000000000000000000001000000E0D057007335CF11AE690800
               2B2E126202000000000000004C0000000114020000000000C000000000000046
               8000000000000000000000000000000000000000000000000000000000000000
@@ -857,7 +857,7 @@ object GikoForm: TGikoForm
     object MessagePanel: TPanel
       Left = 0
       Top = 435
-      Width = 702
+      Width = 696
       Height = 34
       Align = alBottom
       BevelOuter = bvNone
@@ -904,7 +904,7 @@ object GikoForm: TGikoForm
       object MessageListView: TListView
         Left = 28
         Top = 0
-        Width = 674
+        Width = 668
         Height = 34
         Align = alClient
         BorderStyle = bsNone
@@ -935,13 +935,13 @@ object GikoForm: TGikoForm
   object TopPanel: TPanel
     Left = 0
     Top = 0
-    Width = 702
+    Width = 696
     Height = 77
     Align = alTop
     BevelOuter = bvNone
     TabOrder = 3
     object TopRightPanel: TPanel
-      Left = 666
+      Left = 660
       Top = 0
       Width = 36
       Height = 77
@@ -978,7 +978,7 @@ object GikoForm: TGikoForm
     object TopCoolPanel: TPanel
       Left = 0
       Top = 0
-      Width = 666
+      Width = 660
       Height = 77
       Align = alClient
       BevelOuter = bvNone
@@ -986,7 +986,7 @@ object GikoForm: TGikoForm
       object MainCoolBar: TGikoCoolBar
         Left = 0
         Top = 0
-        Width = 666
+        Width = 660
         Height = 70
         AutoSize = True
         BandMaximize = bmDblClick
@@ -995,7 +995,7 @@ object GikoForm: TGikoForm
             Control = MenuToolBar
             ImageIndex = -1
             MinHeight = 18
-            Width = 662
+            Width = 656
           end
           item
             Control = StdToolBar
@@ -1010,14 +1010,14 @@ object GikoForm: TGikoForm
             ImageIndex = -1
             MinHeight = 22
             Text = #12450#12489#12524#12473
-            Width = 422
+            Width = 416
           end
           item
             Control = LinkToolBar
             ImageIndex = -1
             MinHeight = 22
             Text = #12522#12531#12463
-            Width = 662
+            Width = 656
           end>
         OnContextPopup = MainCoolBarContextPopup
         OnResize = MainCoolBarResize
@@ -1026,7 +1026,7 @@ object GikoForm: TGikoForm
         object MenuToolBar: TToolBar
           Left = 9
           Top = 0
-          Width = 649
+          Width = 643
           Height = 18
           AutoSize = True
           ButtonHeight = 18
@@ -1126,7 +1126,7 @@ object GikoForm: TGikoForm
         object AddressToolBar: TToolBar
           Left = 293
           Top = 20
-          Width = 365
+          Width = 359
           Height = 22
           ButtonWidth = 51
           EdgeBorders = []
@@ -1159,7 +1159,7 @@ object GikoForm: TGikoForm
         object LinkToolBar: TToolBar
           Left = 42
           Top = 44
-          Width = 616
+          Width = 610
           Height = 22
           AutoSize = True
           ButtonWidth = 89

diff --git a/Giko.pas b/Giko.pas
index 8deffe5..e75c105 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -526,7 +526,7 @@ type
     BBSSelectPopupMenu: TPopupMenu;
                PlugInMenu: TMenuItem;
     TmpToolBar: TToolBar;
-               procedure FormCreate(Sender: TObject);
+                               procedure FormCreate(Sender: TObject);
                procedure FormDestroy(Sender: TObject);
                procedure CabinetPanelHide(Sender: TObject);
                procedure FormClose(Sender: TObject; var Action: TCloseAction);
@@ -841,6 +841,7 @@ type
     procedure FavoriteTreeViewMouseDown(Sender: TObject;
                        Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
     procedure MessagePanelResize(Sender: TObject);
+    procedure OnResized;
        private
                { Private \90é\8c¾ }
         //RoundList : TRoundList;
@@ -980,8 +981,6 @@ type
                // \83u\83\89\83E\83U\82Ì\83L\81[\83_\83E\83\93\83C\83x\83\93\83g
                // \83C\83x\83\93\83g\82ð\8eæ\82è\88µ\82Á\82½\8fê\8d\87\82Í True \82ð\95Ô\82·
                function BrowserKeydown(Sender: TObject; Key: Word; State:TShiftState) : Boolean;
-               // \83\8a\83T\83C\83Y\82ª\8a®\97¹\82µ\82½
-               procedure UserResized;
 
        protected
                procedure CreateParams(var Params: TCreateParams); override;
@@ -4830,14 +4829,9 @@ begin
        ThreadEditorAction.Enabled := (GetActiveList is TBoard);
 end;
 
-procedure TGikoForm.UserResized;
-begin
-       FOldFormWidth := Width;
-       FIsIgnoreResize := False;
-end;
-
 procedure TGikoForm.FormResize(Sender: TObject);
 begin
+       FIsIgnoreResize := True;
        MessageListView.Column[0].Width := MessageListView.ClientWidth - 32;
        MainCoolBar.Width := TopPanel.Width - TopRightPanel.Width;
 
@@ -6714,7 +6708,7 @@ begin
                USER_TREECLICK:
                        TreeClick( TreeView.Selected );
                USER_RESIZED:
-                       UserResized;
+                       OnResized;
                USER_MINIMIZED:
                        OnMinimized;
                end;
@@ -9217,8 +9211,9 @@ var
        band            : TCoolBand;
        i, j            : Integer;
 begin
-
        if (FOldFormWidth = Width) and not IsIconic( Handle ) and not FIsIgnoreResize then begin
+               FIsIgnoreResize := True;
+               PostMessage( Handle, USER_RESIZED, 0, 0 );
                if not (Sender is TToolBar) or (CoolBar = nil) then
                        Exit;
                toolbar := TToolBar( Sender );
@@ -9481,6 +9476,14 @@ begin
 
 end;
 
+procedure TGikoForm.OnResized;
+begin
+
+       FOldFormWidth := Width;
+       FIsIgnoreResize := False;
+
+end;
+
 initialization
                                OleInitialize(nil);
 finalization