From 061e35e977d028d27f11f36634dfcfb21b175fab Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 23 May 2011 18:37:33 +0000 Subject: [PATCH] .ide: Cleanup of bottompane issues (thanks sender_ghost) git-svn-id: svn://ultimatepp.org/upp/trunk@3449 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ide/Bottom.cpp | 7 +++++++ uppsrc/ide/Builders/Build.cpp | 2 +- uppsrc/ide/ide.h | 5 +++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/uppsrc/ide/Bottom.cpp b/uppsrc/ide/Bottom.cpp index 5fa5fec2f..a5f9421e2 100644 --- a/uppsrc/ide/Bottom.cpp +++ b/uppsrc/ide/Bottom.cpp @@ -184,6 +184,13 @@ void Ide::SetBottom(int i) SyncBottom(); } +void Ide::ShowBottom(int i) +{ + if(i == btabs.GetCursor() && IsBottomShown()) + return; + SetBottom(i); +} + void Ide::ToggleBottom(int i) { if(i == btabs.GetCursor() && IsBottomShown()) diff --git a/uppsrc/ide/Builders/Build.cpp b/uppsrc/ide/Builders/Build.cpp index b34a9f1b2..c78663094 100644 --- a/uppsrc/ide/Builders/Build.cpp +++ b/uppsrc/ide/Builders/Build.cpp @@ -572,7 +572,7 @@ bool MakeBuild::Build() VectorMap bm = GetMethodVars(method); if(bm.GetCount() == 0) { PutConsole("Invalid build method"); - ShowConsole(); + ConsoleShow(); return false; } One host = CreateHost(false); diff --git a/uppsrc/ide/ide.h b/uppsrc/ide/ide.h index 2b73ba32d..42617b28a 100644 --- a/uppsrc/ide/ide.h +++ b/uppsrc/ide/ide.h @@ -747,8 +747,9 @@ public: void HideBottom(); void SetBottom(int i); void ToggleBottom(int i); - void ShowConsole() { SetBottom(1); } - void ShowConsole2() { SetBottom(2); } + void ShowBottom(int i); + void ShowConsole() { ShowBottom(1); } + void ShowConsole2() { ShowBottom(2); } void ToggleConsole() { ToggleBottom(1); } void SwapBottom(); bool IsBottomShown() const;