お気に入りキャビネットで、スペースキーでDLできない。

および、コンテキストポップアップでDLができない不具合の修正。

diff --git a/Giko.pas b/Giko.pas
index 16a94d0..9f84dd8 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -6092,8 +6092,10 @@ begin
                        FavoriteTreeView.Selected.Expanded := not FavoriteTreeView.Selected.Expanded;
                        end;
                VK_SPACE:
-                       GikoDM.FavoriteTreeViewReloadActionExecute(
-                                                       TObject(FavoriteTreeView.Selected));
+                       begin
+                       FClickNode := FavoriteTreeView.Selected;
+                       GikoDM.FavoriteTreeViewReloadActionExecute( Sender );
+                       end;
                end;
        end else begin
                //\95Ò\8fW\92\86\82ÉESC\82ð\89\9f\82µ\82½\82ç\81A\95Ò\8fW\82ð\8fI\97¹\82µ\82Ä\81A\8c³\82Ì\95¶\8e\9a\97ñ\82É\96ß\82·
@@ -6688,9 +6690,9 @@ begin
                                if ((rect.Left <= X) and (rect.Right >= X)) and
                                        ((rect.Bottom >= Y) and (rect.Top <= Y)) then begin
                                        if ssDouble in Shift then begin
-                                               GikoDM.FavoriteTreeViewReloadActionExecute(
-                                                       TObject(FavoriteTreeView.Selected));
-
+                                               FClickNode := FavoriteTreeView.Selected;
+                                               GikoDM.FavoriteTreeViewReloadActionExecute(Sender);
+                                               FClickNode := nil;
                                        end else begin
                                                FavoriteClick(
                                                        TObject(FavoriteTreeView.Selected));

diff --git a/GikoDataModule.pas b/GikoDataModule.pas
index 797af22..0b29dcd 100644 (file)
--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -695,28 +695,21 @@ end;
 // *************************************************************************
 procedure TGikoDM.FavoriteTreeViewReloadActionExecute(Sender: TObject);
 var
-       ThreadItem: TThreadItem;
        FavThread: TFavoriteThreadItem;
-       Board: TBoard;
        FavBoard: TFavoriteBoardItem;
        shiftDown: Boolean;
-       Node : TTreeNode;
 begin
-       if (Sender = nil) or not (Sender is TTreeNode) then Exit;
-
-       Node := TTreeNode(Sender);
+       if (GikoForm.ClickNode = nil) then Exit;
 
        shiftDown := GetAsyncKeyState(VK_SHIFT) = Smallint($8001);
 
-       if TObject( Node.Data ) is TFavoriteThreadItem then begin
-               FavThread := TFavoriteThreadItem( Node.Data );
-               ThreadItem := FavThread.Item;
-               if ThreadItem <> nil then
-                       GikoForm.DownloadContent(ThreadItem, shiftDown);
-       end else if TObject( Node.Data ) is TFavoriteBoardItem then begin
-               FavBoard := TFavoriteBoardItem( Node.Data );
-               Board := FavBoard.Item;
-               GikoForm.DownloadList(Board, shiftDown);
+       if TObject( GikoForm.ClickNode.Data ) is TFavoriteThreadItem then begin
+               FavThread := TFavoriteThreadItem( GikoForm.ClickNode.Data );
+               if FavThread.Item <> nil then
+                       GikoForm.DownloadContent(FavThread.Item, shiftDown);
+       end else if TObject( GikoForm.ClickNode.Data ) is TFavoriteBoardItem then begin
+               FavBoard := TFavoriteBoardItem( GikoForm.ClickNode.Data );
+               GikoForm.DownloadList(FavBoard.Item, shiftDown);
        end;
 
 end;