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

Bugfix: Problem in logical construct; tab was always switched when not in drag mode, which was obviously not the intention.

Browse Source 
Bugfix: Hiding tabs causes the active tab to switch implicitly.  Move code that depends on the active tab to happen before tabs are hidden.
Change: Don't switch away from query tab when switching tables etc.
This commit is contained in:
rosenfield
2007-07-27 10:51:54 +00:00
parent 3174feaf64
commit 7807465aa6
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
source/childwin.pas
View File

@ -1225,18 +1225,16 @@ end;
procedure TMDIChild.SelectHost;
begin
if (not DBTree.Dragging) and (
(PageControlMain.ActivePage = tabDatabase) or
(PageControlMain.ActivePage = tabTable) or
(PageControlMain.ActivePage = tabData)
) then PageControlMain.ActivePage := tabHost;
tabDatabase.TabVisible := false;
tabTable.TabVisible := false;
tabData.TabVisible := false;
if (
( not DBTree.Dragging ) or
( PageControlMain.ActivePage = tabDatabase ) or
( PageControlMain.ActivePage = tabTable ) or
( PageControlMain.ActivePage = tabData )
) then
begin
PageControlMain.ActivePage := tabHost;
end;
Caption := Description;
ActualDatabase := '';
ActualTable := '';
@ -1245,17 +1243,15 @@ end;
procedure TMDIChild.SelectDatabase(db: String);
begin
if (not DBTree.Dragging) and (
(PageControlMain.ActivePage = tabTable) or
(PageControlMain.ActivePage = tabData)
) then PageControlMain.ActivePage := tabDatabase;
tabDatabase.TabVisible := true;
tabTable.TabVisible := false;
tabData.TabVisible := false;
if (
( not DBTree.Dragging ) or
( PageControlMain.ActivePage = tabTable ) or
( PageControlMain.ActivePage = tabData )
) then
begin
PageControlMain.ActivePage := tabDatabase;
end;
ListTables.Items.Clear();
ListColumns.Items.Clear();
pnlTableTop.Caption := 'Table-Properties';
@ -1280,9 +1276,6 @@ end;
procedure TMDIChild.SelectTable(db: String; table: String; switchView: boolean = true);
begin
tabDatabase.TabVisible := true;
tabTable.TabVisible := true;
tabData.TabVisible := true;
dataselected := false;
ActualDatabase := db;
ActualTable := table;
@ -2126,8 +2119,15 @@ begin
Screen.Cursor := crHourGlass;
if (PageControlMain.ActivePage <> tabData) and (not DBTree.Dragging) then
PageControlMain.ActivePage := tabTable;
if (not DBTree.Dragging) and (
(PageControlMain.ActivePage = tabHost) or
(PageControlMain.ActivePage = tabDatabase)
) then PageControlMain.ActivePage := tabTable;
tabDatabase.TabVisible := true;
tabTable.TabVisible := true;
tabData.TabVisible := true;
pnlTableTop.Caption := 'Table-Properties for ' + ActualDatabase + ': ' + ActualTable;
// set current node in DBTree to ActualTable: