From 4deed4a75847876562bca0962de3751856abfaa7 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 31 Jan 2013 09:18:30 +0000
Subject: [PATCH] more tweaks
---
Common/GmshMessage.cpp | 4 ++--
Fltk/FlGui.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Common/GmshMessage.cpp b/Common/GmshMessage.cpp
index 3dbc13fd5d..01afdf7a5e 100644
--- a/Common/GmshMessage.cpp
+++ b/Common/GmshMessage.cpp
@@ -225,7 +225,7 @@ void Msg::Fatal(const char *fmt, ...)
std::string tmp = std::string("@C1@.") + "Fatal : " + str;
FlGui::instance()->addMessage(tmp.c_str());
if(_firstError.empty()) _firstError = str;
- FlGui::instance()->setLastStatus(FL_DARK_RED);
+ FlGui::instance()->setLastStatus(FL_RED);
FlGui::instance()->saveMessages
((CTX::instance()->homeDir + CTX::instance()->errorFileName).c_str());
fl_alert("A fatal error has occurred which will force Gmsh to abort.\n"
@@ -271,7 +271,7 @@ void Msg::Error(const char *fmt, ...)
std::string tmp = std::string("@C1@.") + "Error : " + str;
FlGui::instance()->addMessage(tmp.c_str());
if(_firstError.empty()) _firstError = str;
- FlGui::instance()->setLastStatus(FL_DARK_RED);
+ FlGui::instance()->setLastStatus(FL_RED);
}
#endif
diff --git a/Fltk/FlGui.cpp b/Fltk/FlGui.cpp
index 87cd9ae3dd..6956a5be85 100644
--- a/Fltk/FlGui.cpp
+++ b/Fltk/FlGui.cpp
@@ -832,7 +832,7 @@ void FlGui::setStatus(const std::string &msg, bool opengl)
void FlGui::setLastStatus(int col)
{
for(unsigned int i = 0; i < graph.size(); i++){
- if(col >= 0)
+ if(col >= 0 && graph[0]->getMessageHeight() < FL_NORMAL_SIZE)
graph[i]->getProgress()->labelcolor(col);
else
graph[i]->getProgress()->labelcolor(FL_FOREGROUND_COLOR);
--
GitLab