opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-26 19:20:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #3366: Do not set object as favorite when mouse moves from db to table node between mouse-down and mouse-up event.

Browse Source
This commit is contained in:
Ansgar Becker
2013-10-14 16:54:52 +00:00
parent 03022d276c
commit db7af3139b
2 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/main.dfm
View File

@ -686,7 +686,7 @@ object MainForm: TMainForm
OnGetNodeDataSize = DBtreeGetNodeDataSize
OnInitChildren = DBtreeInitChildren
OnInitNode = DBtreeInitNode
OnNodeClick = DBtreeNodeClick
OnMouseUp = DBtreeMouseUp
Columns = <
item
Position = 0

24
source/main.pas
View File

@ -914,9 +914,9 @@ type
procedure DBtreeAfterCellPaint(Sender: TBaseVirtualTree;
TargetCanvas: TCanvas; Node: PVirtualNode; Column: TColumnIndex;
CellRect: TRect);
procedure DBtreeNodeClick(Sender: TBaseVirtualTree;
const HitInfo: THitInfo);
procedure actFavoriteObjectsOnlyExecute(Sender: TObject);
procedure DBtreeMouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
private
// Executable file details
FAppVerMajor: Integer;
@ -10519,33 +10519,29 @@ begin
end;
procedure TMainForm.DBtreeNodeClick(Sender: TBaseVirtualTree; const HitInfo: THitInfo);
procedure TMainForm.DBtreeMouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
var
Obj: PDBObject;
Node: PVirtualNode;
idx: Integer;
begin
// Watch out for clicks on favorite icon
// Add or remove object path from favorite list on click
if (HitInfo.HitColumn <> 0)
or (not Assigned(HitInfo.HitNode))
then Exit;
if
(not (hiOnItem in HitInfo.HitPositions))
or (hiOnItemLabel in HitInfo.HitPositions)
or (hiOnItemRight in HitInfo.HitPositions)
or (hiOnNormalIcon in HitInfo.HitPositions)
then Exit;
Obj := Sender.GetNodeData(HitInfo.HitNode);
Node := DBtree.GetNodeAt(X, Y);
if (Button = mbLeft) and (X < ImageListMain.Width) and Assigned(Node) then begin
Obj := DBtree.GetNodeData(Node);
if Obj.NodeType in [lntTable..lntEvent] then begin
idx := Obj.Connection.Favorites.IndexOf(Obj.Path);
if idx > -1 then
Obj.Connection.Favorites.Delete(idx)
else
Obj.Connection.Favorites.Add(Obj.Path);
DBtree.RepaintNode(Node);
AppSettings.SessionPath := Obj.Connection.Parameters.SessionPath;
AppSettings.WriteString(asFavoriteObjects, Obj.Connection.Favorites.Text);
end;
end;
end;