細かいバグの修正

diff --git a/Giko.pas b/Giko.pas
index 18d5aa9..c73289d 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -3135,12 +3135,8 @@ begin
 end;
 
 procedure TGikoForm.WorkEnd(Sender: TObject; AWorkMode: TWorkMode; Number: Integer);
-var
-       i: Integer;
 begin
-//     ProgressBar.Visible := False;
        ProgressBar.Position := 0;
-//     SetProgressValue(Number, 0);
        if FDownloadMax <> 0 then
                StatusBar.Panels[1].Text := FDownloadTitle + ' - \83_\83E\83\93\83\8d\81[\83h\82ª\8a®\97¹\82µ\82Ü\82µ\82½';
 end;
@@ -3297,7 +3293,7 @@ begin
                        BrowserNullTab.Browser := Browser;
                end;
                BrowserNullTab.thread := ThreadItem;
-               BrowserNullTab.Browser.Navigate( 'about:blank' );
+               BrowserNullTab.Browser.Navigate(BLANK_HTML);
                SetWindowPos( BrowserNullTab.Browser.Handle, HWND_TOPMOST, 0, 0, BrowserPanel.Width, BrowserPanel.Height, SWP_NOACTIVATE or SWP_NOZORDER);
                BrowserTab.TabIndex := -1;
                SetContent(BrowserNullTab);
@@ -5243,8 +5239,10 @@ begin
                if TBrowserRecord(BrowserTab.Tabs.Objects[i]) = BrowserRecord then begin
                        BrowserTab.Tabs.BeginUpdate;
                        try
-                               doc := TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser.Document;
-                               TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread.ScrollTop := doc.Body.ScrollTop;
+                               if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser <> nil then begin
+                                       doc := TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser.Document;
+                                       TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread.ScrollTop := doc.Body.ScrollTop;
+                               end;
                        except
                                TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread.ScrollTop := 0;
                        end;
@@ -5300,13 +5298,15 @@ begin
                if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread = ThreadItem then begin
                        BrowserTab.Tabs.BeginUpdate;
                        try
-                               doc := TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser.Document;
-                               TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread.ScrollTop := doc.Body.ScrollTop;
+                               if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser <> nil then begin
+                                       doc := TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser.Document;
+                                       TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread.ScrollTop := doc.Body.ScrollTop;
+                               end;
                        except
                                TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread.ScrollTop := 0;
                        end;
                        if(FActiveContent = TBrowserRecord(BrowserTab.Tabs.Objects[i])) then
-               FActiveContent := nil;
+                               FActiveContent := nil;
                        if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser <> nil then begin
                                j := FBrowsers.IndexOf(TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser);
                                if j <> -1 then
@@ -5608,8 +5608,6 @@ begin
        BrowserTab.OnChange := nil;
        BrowserTab.Tabs.BeginUpdate;
        for i := BrowserTab.Tabs.Count - 1 downto 0 do begin
-               if TBrowserRecord(BrowserTab.Tabs.Objects[i]).FBrowser <> nil then
-                       TOleControl(TBrowserRecord(BrowserTab.Tabs.Objects[i]).FBrowser).Visible := false;
                TBrowserRecord(BrowserTab.Tabs.Objects[i]).Free;
        end;
        BrowserTab.Tabs.Clear;
@@ -5968,7 +5966,6 @@ var
        p: TPoint;
        p2: TPoint;
        idx: Integer;
-       OldIndex: Integer;
 begin
        if Button = mbMiddle then begin
                // \83}\83E\83X\92\86\83{\83^\83\93
@@ -6310,7 +6307,6 @@ begin
                AddMessageList('\83\8d\83O\83A\83E\83g\82µ\82Ü\82µ\82½', nil, gmiOK);
                LoginAction.Caption := '\83\8d\83O\83C\83\93(&L)';
        end else begin
-        GikoSys.Dolib.DolibURL := GikoSys.Setting.DolibURL;
                TmpCursor := Screen.Cursor;
                Screen.Cursor := crHourGlass;
                try
@@ -9923,7 +9919,7 @@ var
        iOIPAO          : IOleInPlaceActiveObject;
        Dispatch        : IDispatch;
 begin
-
+       Result := False;
        if Key = VK_BACK then begin
                UpBoardAction.Execute;
                Result := True;
@@ -9944,9 +9940,8 @@ begin
                                        iOIPAO.TranslateAccelerator( Msg );
                        end;
                end;
-
                // \83M\83R\83i\83r\82Å\8eg\82¤\83V\83\87\81[\83g\83J\83b\83g\82Í\8eó\82¯\8eæ\82è\82½\82¢\82Ì\82Å\83C\83x\83\93\83g\82Í\83J\83b\83g\82µ\82È\82¢
-               Result := False;
+               //Result := False;
        end;
 
 end;
@@ -9967,7 +9962,7 @@ begin
                end;
 
        WM_XBUTTONDOWN:
-               case Msg.wParam shr 16 of
+       case Msg.wParam shr 16 of
                XBUTTON1:
                        if (FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin
                                if IsDialogMessage( FActiveContent.Browser.Handle, Msg ) then begin
@@ -9982,7 +9977,7 @@ begin
                end;
        end;
 
-       end;
+end;
 
 procedure TGikoForm.FavoriteTreeViewMouseDown(Sender: TObject;
        Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
@@ -10067,7 +10062,7 @@ begin
                        Self.Thread.ScrollTop := doc.Body.ScrollTop;
                        //doc.clear;
                end;
-               //Self.FBrowser.Free;
+               TOleControl(Self.FBrowser).Visible := false;
        end;
 
 end;