未取得のスレッドのリンクを踏んだときにスレッドの描画が切り替わらない不具合の修正

diff --git a/Giko.dfm b/Giko.dfm
index d07ed6b..6fba2dc 100644 (file)
--- a/Giko.dfm
+++ b/Giko.dfm
@@ -16,11 +16,9 @@ object GikoForm: TGikoForm
   KeyPreview = True
   OldCreateOrder = False
   Visible = True
-  OnClose = FormClose
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnDestroy = FormDestroy
-  OnKeyUp = FormKeyUp
   OnMouseWheel = FormMouseWheel
   OnResize = FormResize
   OnShortCut = FormShortCut

diff --git a/Giko.pas b/Giko.pas
index b1761d8..5df8ba0 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -579,7 +579,6 @@ type
                                procedure FormCreate(Sender: TObject);
                procedure FormDestroy(Sender: TObject);
                procedure CabinetPanelHide(Sender: TObject);
-               procedure FormClose(Sender: TObject; var Action: TCloseAction);
                procedure ListViewData(Sender: TObject; Item: TListItem);
                procedure ListViewDataFind(Sender: TObject; Find: TItemFind;
                        const FindString: String; const FindPosition: TPoint;
@@ -807,8 +806,6 @@ type
                procedure SelectComboBoxExit(Sender: TObject);
                procedure SelectResActionExecute(Sender: TObject);
                procedure SelectResActionUpdate(Sender: TObject);
-               procedure FormKeyUp(Sender: TObject; var Key: Word;
-                       Shift: TShiftState);
                procedure AllResActionExecute(Sender: TObject);
                procedure AllResActionUpdate(Sender: TObject);
                procedure ReloadClick(Sender: TObject);
@@ -992,6 +989,7 @@ type
                FMouseDownPos           : TPoint;                               // \83u\83\89\83E\83U\83^\83u\82Å\83}\83E\83X\82ð\89\9f\82µ\82½\82Æ\82«\82Ì\8dÀ\95W
                FBrowsers: TList;
                FResRangeMenuSelect     : Longint;              ///< ResRangeButton \82Å\91I\91ð\82³\82ê\82Ä\82¢\82é\8d\80\96Ú (\83t\83H\81[\83}\83b\83g\82Í ResRange \8cÝ\8a·)
+               FStartUp : Boolean;
                procedure SetBoardTreeNode( inBBS : TBBS );
                function SetCategoryListItem(ABBS2ch: TBBS): Integer;
                function SetBoardListItem(Category: TCategory): Integer;
@@ -1295,11 +1293,12 @@ begin
        Writeln(' \8fI\97¹\8e\9e\82Í\81A\83M\83R\83i\83r\83E\83B\83\93\83h\83E\82ð\95Â\82¶\82Ä\82­\82¾\82³\82¢');
        Writeln('============================================================');
 {$ENDIF}
+       FStartUp := false;
        Application.OnDeactivate := AppFormDeactivate;
        Self.OnDeactivate := AppFormDeactivate;
        Application.HookMainWindow(Hook);
        Application.OnMessage := HandleAppMessage; //\82È\82ñ\82©\96³\82­\82Ä\82à\91å\8fä\95v\82É\82È\82Á\82½\81@by\81@\82à\82¶\82ã
-       Self.DoubleBuffered := true;
+//     Self.DoubleBuffered := true;
        FTreeType := gttNone;
 
        FSearchDialog := nil;
@@ -1314,13 +1313,14 @@ begin
                newBrowser.Align := alNone;
                newBrowser.Left := 0;
                newBrowser.Top  := 0;
-        //newBrowser.DoubleBuffered := true;
+               newBrowser.StatusBar    := false;
+               newBrowser.MenuBar              := false;
+               newBrowser.AddressBar   := false;
                newBrowser.OnDocumentComplete   := BrowserDocumentComplete;
                newBrowser.OnBeforeNavigate2    := BrowserBeforeNavigate2;
                newBrowser.OnEnter                              := BrowserEnter;
                newBrowser.OnNewWindow2                 := BrowserNewWindow2;
                newBrowser.OnStatusTextChange   := BrowserStatusTextChange;
-               //newBrowser.OnTitleChange              := BrowserTitleChange;
                newBrowser.Navigate(BLANK_HTML);
                ShowWindow(newBrowser.Handle, SW_HIDE);
 
@@ -1818,62 +1818,64 @@ end;
 //
 procedure TGikoForm.FormShow(Sender: TObject);
 begin
-       ShowWindow(Application.Handle, SW_HIDE);
-
-       //FormCreate\82Å\82â\82é\82Æ\89Â\8e\8b\90Ý\92è\82ª\94½\89f\82³\82ê\82È\82¢\8fê\8d\87\82ª\82 \82é\82Ì\82ÅFormShow\82Å\82â\82é\82±\82Æ\82É\82µ\82½
-       //\83c\81[\83\8b\83o\81[\95\\8e¦
-       StdToolBarVisibleAction.Checked := GikoSys.Setting.StdToolBarVisible;
-       StdToolBarVisibleActionExecute( nil );
-       AddressBarVisibleAction.Checked := GikoSys.Setting.AddressBarVisible;
-       AddressBarVisibleActionExecute( nil );
-       LinkBarVisibleAction.Checked := GikoSys.Setting.LinkBarVisible;
-       LinkBarVisibleActionExecute( nil );
-       ListToolBarVisibleAction.Checked := GikoSys.Setting.ListToolBarVisible;
-       ListToolBarVisibleActionExecute( nil );
-       ListNameBarVisibleAction.Checked := GikoSys.Setting.ListNameBarVisible;
-       ListNameBarVisibleActionExecute( nil );
-       BrowserToolBarVisibleAction.Checked := GikoSys.Setting.BrowserToolBarVisible;
-       BrowserToolBarVisibleActionExecute( nil );
-       BrowserNameBarVisibleAction.Checked := GikoSys.Setting.BrowserNameBarVisible;
-       BrowserNameBarVisibleActionExecute( nil );
-
-       //\83u\83\89\83E\83U\83^\83u
-       BrowserTabVisibleAction.Checked := GikoSys.Setting.BrowserTabVisible;
-       BrowserTabVisibleActionExecute(nil);
-
-       if GikoSys.Setting.BrowserTabPosition = gtpTop then begin
-               BrowserTabTopAction.Checked := True;
-               BrowserTabTopActionExecute(nil);
-       end else begin
-               BrowserTabBottomAction.Checked := True;
-               BrowserTabBottomActionExecute(nil);
-       end;
+       if not FStartUp then begin
+               ShowWindow(Application.Handle, SW_HIDE);
+
+               //FormCreate\82Å\82â\82é\82Æ\89Â\8e\8b\90Ý\92è\82ª\94½\89f\82³\82ê\82È\82¢\8fê\8d\87\82ª\82 \82é\82Ì\82ÅFormShow\82Å\82â\82é\82±\82Æ\82É\82µ\82½
+               //\83c\81[\83\8b\83o\81[\95\\8e¦
+               StdToolBarVisibleAction.Checked := GikoSys.Setting.StdToolBarVisible;
+               StdToolBarVisibleActionExecute( nil );
+               AddressBarVisibleAction.Checked := GikoSys.Setting.AddressBarVisible;
+               AddressBarVisibleActionExecute( nil );
+               LinkBarVisibleAction.Checked := GikoSys.Setting.LinkBarVisible;
+               LinkBarVisibleActionExecute( nil );
+               ListToolBarVisibleAction.Checked := GikoSys.Setting.ListToolBarVisible;
+               ListToolBarVisibleActionExecute( nil );
+               ListNameBarVisibleAction.Checked := GikoSys.Setting.ListNameBarVisible;
+               ListNameBarVisibleActionExecute( nil );
+               BrowserToolBarVisibleAction.Checked := GikoSys.Setting.BrowserToolBarVisible;
+               BrowserToolBarVisibleActionExecute( nil );
+               BrowserNameBarVisibleAction.Checked := GikoSys.Setting.BrowserNameBarVisible;
+               BrowserNameBarVisibleActionExecute( nil );
+
+               //\83u\83\89\83E\83U\83^\83u
+               BrowserTabVisibleAction.Checked := GikoSys.Setting.BrowserTabVisible;
+               BrowserTabVisibleActionExecute(nil);
 
-       if GikoSys.Setting.BrowserTabStyle = gtsTab then begin
-               BrowserTabTabStyleAction.Checked := True;
-               BrowserTabTabStyleActionExecute(nil);
-       end else if GikoSys.Setting.BrowserTabStyle = gtsButton then begin
-               BrowserTabButtonStyleAction.Checked := True;
-               BrowserTabButtonStyleActionExecute(nil);
-       end else begin
-               BrowserTabFlatStyleAction.Checked := True;
-               BrowserTabFlatStyleActionExecute(nil);
-       end;
+               if GikoSys.Setting.BrowserTabPosition = gtpTop then begin
+                       BrowserTabTopAction.Checked := True;
+                       BrowserTabTopActionExecute(nil);
+               end else begin
+                       BrowserTabBottomAction.Checked := True;
+                       BrowserTabBottomActionExecute(nil);
+               end;
 
-       // ListView \82Ì\83w\83b\83_\83h\83\89\83b\83O
-       ListView.LVMInstallHeaderDrag;
+               if GikoSys.Setting.BrowserTabStyle = gtsTab then begin
+                       BrowserTabTabStyleAction.Checked := True;
+                       BrowserTabTabStyleActionExecute(nil);
+               end else if GikoSys.Setting.BrowserTabStyle = gtsButton then begin
+                       BrowserTabButtonStyleAction.Checked := True;
+                       BrowserTabButtonStyleActionExecute(nil);
+               end else begin
+                       BrowserTabFlatStyleAction.Checked := True;
+                       BrowserTabFlatStyleActionExecute(nil);
+               end;
 
-       // CoolBar \95\9c\8c³
-       LoadCoolBarSettings;
+               // ListView \82Ì\83w\83b\83_\83h\83\89\83b\83O
+               ListView.LVMInstallHeaderDrag;
 
-       FIsIgnoreResize := False;
+               // CoolBar \95\9c\8c³
+               LoadCoolBarSettings;
 
-       //TabAutoLoad
-       //FormCrete\82©\82ç\88Ú\93®\81B
-       if GikoSys.Setting.TabAutoLoadSave then begin
-               TabAutoLoadAction.Execute;
-       end;
+               FIsIgnoreResize := False;
 
+               //TabAutoLoad
+               //FormCrete\82©\82ç\88Ú\93®\81B
+               if GikoSys.Setting.TabAutoLoadSave then begin
+                       TabAutoLoadAction.Execute;
+               end;
+               FStartUp := true;
+       end;
 end;
 
 procedure TGikoForm.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
@@ -2082,10 +2084,6 @@ begin
 
 end;
 
-//\83t\83H\81[\83\80\83N\83\8d\81[\83Y
-procedure TGikoForm.FormClose(Sender: TObject; var Action: TCloseAction);
-begin
-end;
 //\83L\83\83\83r\83l\83b\83g\81~\83{\83^\83\93\83N\83\8a\83b\83N
 procedure TGikoForm.CabinetPanelHide(Sender: TObject);
 begin
@@ -3789,11 +3787,11 @@ begin
                        if ThreadItem.ParentBoard.UnRead < 0 then ThreadItem.ParentBoard.UnRead := 0;
                        TreeView.Refresh;
                end;
-{              if(FActiveContent <> nil) and (FActiveContent <> Thread) then begin
+               if(FActiveContent <> nil) and (FActiveContent <> Thread) then begin
                        if (FActiveContent.Browser <> BrowserNullTab.Browser) then
                                ShowWindow(FActiveContent.Browser.Handle, SW_HIDE);
                end;
-}
+
                ShowWindow(Thread.FBrowser.Handle, SW_SHOW);
                if (not Assigned(Thread.Browser.Document)) then begin
                        Thread.Browser.Navigate('about:blank');
@@ -3915,7 +3913,6 @@ end;
 
 procedure TGikoForm.SetActiveList(Obj: TObject);
 var
-       i               : Integer;
        idx     : Integer;
 begin
 //     if FActiveList <> Obj then begin
@@ -5536,7 +5533,6 @@ end;
 procedure TGikoForm.FormResize(Sender: TObject);
 var
        doc                                             : Variant;
-       i : Integer;
 begin
 
        MessageListView.Column[0].Width := MessageListView.ClientWidth - 32;
@@ -9013,11 +9009,6 @@ begin
        SelectResAction.Enabled := (GetActiveContent <> nil) and (GetActiveContent.IsLogFile);
 end;
 
-procedure TGikoForm.FormKeyUp(Sender: TObject; var Key: Word;
-       Shift: TShiftState);
-begin
-end;
-
 // \91S\82Ä\82Ì\83\8c\83X\82ð\95\\8e¦
 procedure TGikoForm.AllResActionExecute(Sender: TObject);
 var