opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-16 11:42:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: regression introduced in revision 1104 - Abort()ing in popupTreeView causes various misbehaviours.

Browse Source 
Also added three debug statements so the rest of you can test and see that things happen in the right order now; feel free to remove these.
This commit is contained in:
rosenfield
2007-11-08 12:10:37 +00:00
parent c8d8712a89
commit a706163966
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/childwin.dfm
View File

@ -57,7 +57,6 @@ object MDIChild: TMDIChild
HotTrack = True HotTrack = True
Images = MainForm.ImageList1 Images = MainForm.ImageList1
Indent = 19 Indent = 19
PopupMenu = popupTreeView
ReadOnly = True ReadOnly = True
RightClickSelect = True RightClickSelect = True
RowSelect = True RowSelect = True
@ -65,6 +64,7 @@ object MDIChild: TMDIChild
TabOrder = 0 TabOrder = 0
OnChange = DBtreeChange OnChange = DBtreeChange
OnChanging = DBtreeChanging OnChanging = DBtreeChanging
OnContextPopup = DBtreeContextPopup
OnExpanding = DBtreeExpanding OnExpanding = DBtreeExpanding
end end
object TableShow: TPanel object TableShow: TPanel

19
source/childwin.pas
View File

@ -308,6 +308,8 @@ type
N25: TMenuItem; N25: TMenuItem;
menuLogToFile: TMenuItem; menuLogToFile: TMenuItem;
menuOpenLogFolder: TMenuItem; menuOpenLogFolder: TMenuItem;
procedure DBtreeContextPopup(Sender: TObject; MousePos: TPoint;
var Handled: Boolean);
procedure DBtreeChanging(Sender: TObject; Node: TTreeNode; procedure DBtreeChanging(Sender: TObject; Node: TTreeNode;
var AllowChange: Boolean); var AllowChange: Boolean);
procedure menuRenameColumnClick(Sender: TObject); procedure menuRenameColumnClick(Sender: TObject);
@ -1494,6 +1496,15 @@ begin
end; end;
procedure TMDIChild.DBtreeContextPopup(Sender: TObject; MousePos: TPoint;
var Handled: Boolean);
begin
debug('context menu; storing right click item so it won''t get lost');
DBRightClickSelectedItem := DBtree.Selected;
popupTreeView.Popup(MousePos.X, MousePos.Y);
PostMessage(MainForm.Handle, WM_CLEAR_RIGHTCLICK_POINTER, 0, 0);
end;
{*** {***
A database-node is about to be expanded: A database-node is about to be expanded:
Drop the dummy-node and add all tables Drop the dummy-node and add all tables
@ -4513,7 +4524,6 @@ end;
procedure TMDIChild.popupTreeViewPopup(Sender: TObject); procedure TMDIChild.popupTreeViewPopup(Sender: TObject);
begin begin
if DBRightClickSelectedItem <> nil then Exit;
// toggle drop-items and remember right-clicked item // toggle drop-items and remember right-clicked item
PopupMenuDropDatabase.Enabled := DBtree.Selected.Level = 1; PopupMenuDropDatabase.Enabled := DBtree.Selected.Level = 1;
PopupMenuCreateTable.Enabled := DBtree.Selected.Level in [1,2]; PopupMenuCreateTable.Enabled := DBtree.Selected.Level in [1,2];
@ -4524,13 +4534,6 @@ begin
menuAlterDatabase.Hint := 'Rename and/or modify character set of database'; menuAlterDatabase.Hint := 'Rename and/or modify character set of database';
menuTreeAlterTable.Enabled := DBtree.Selected.Level = 2; menuTreeAlterTable.Enabled := DBtree.Selected.Level = 2;
MainForm.DropTable.Enabled := DBtree.Selected.Level = 2; MainForm.DropTable.Enabled := DBtree.Selected.Level = 2;
DBRightClickSelectedItem := DBtree.Selected;
try
popupTreeView.Popup(Mouse.CursorPos.X, Mouse.CursorPos.Y);
Abort;
finally
PostMessage(MainForm.Handle, WM_CLEAR_RIGHTCLICK_POINTER, 0, 0);
end;
end; end;

2
source/main.pas
View File

@ -285,6 +285,7 @@ end;
procedure TMainForm.HandleWMClearRightClickPointer(var msg: TMessage); procedure TMainForm.HandleWMClearRightClickPointer(var msg: TMessage);
begin begin
debug('clearing stored right click item');
ChildWin.DBRightClickSelectedItem := nil; ChildWin.DBRightClickSelectedItem := nil;
end; end;
@ -955,6 +956,7 @@ var
t : TStringList; t : TStringList;
db, msg, sql, activeDB : String; db, msg, sql, activeDB : String;
begin begin
debug('drop table activated');
t := TStringlist.Create; t := TStringlist.Create;
// Set default database name to to ActiveDatabase. // Set default database name to to ActiveDatabase.
// Can be overwritten when someone selects a table in dbtree from different database // Can be overwritten when someone selects a table in dbtree from different database