From 8efd8f7f47bb84e3bfca07e64693514a8f90240b Mon Sep 17 00:00:00 2001 From: s_nakamoto Date: Tue, 22 Jun 2010 03:45:37 +0000 Subject: [PATCH] re-enable hiding taskbar button on minimize on linux, though it doesn't work cleanly git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@89 1a98c847-1fd6-4fd8-948a-caf3550aa51b --- main.cpp | 2 +- ui.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/main.cpp b/main.cpp index 0f333765c..e21d4909e 100644 --- a/main.cpp +++ b/main.cpp @@ -2725,7 +2725,7 @@ void BitcoinMiner() string strStatus = strprintf(" %.0f khash/s", dHashesPerSec/1000.0); UIThreadCall(bind(CalledSetStatusBar, strStatus, 0)); static int64 nLogTime; - if (GetTime() - nLogTime > 60 * 60) + if (GetTime() - nLogTime > 30 * 60) { nLogTime = GetTime(); printf("%s ", DateTimeStrFormat("%x %H:%M", GetTime()).c_str()); diff --git a/ui.cpp b/ui.cpp index e51c1e2e5..42da9ca38 100644 --- a/ui.cpp +++ b/ui.cpp @@ -375,13 +375,13 @@ void CMainFrame::OnIconize(wxIconizeEvent& event) // to get rid of the deprecated warning. Just ignore it. if (!event.Iconized()) fClosedToTray = false; -#ifdef __WXMSW__ +//#ifdef __WXMSW__ // The tray icon sometimes disappears on ubuntu karmic - // Hiding the taskbar button doesn't work reliably on ubuntu lucid + // Hiding the taskbar button doesn't work cleanly on ubuntu lucid if (fMinimizeToTray && event.Iconized()) fClosedToTray = true; Show(!fClosedToTray); -#endif +//#endif ptaskbaricon->Show(fMinimizeToTray || fClosedToTray); } @@ -2437,7 +2437,7 @@ void CMyTaskBarIcon::Show(bool fShow) { strlcpy(pszPrevTip, strTooltip.c_str(), sizeof(pszPrevTip)); #ifdef __WXMSW__ - // somehow it'll choose the wrong icon and scale it down if + // somehow it'll choose the wrong size and scale it down if // we use the main icon, so we hand it one with only 16x16 SetIcon(wxICON(favicon), strTooltip); #else