From d0d120837ccf0a20c6d43a1193f257cfaeb194f6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 1 Jun 2011 23:16:44 +0300 Subject: Change trade window font to secure font if need. --- src/gui/tradewindow.cpp | 4 ++++ src/gui/widgets/window.cpp | 3 ++- src/gui/widgets/window.h | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) (limited to 'src/gui') diff --git a/src/gui/tradewindow.cpp b/src/gui/tradewindow.cpp index 6ed09669a..e7e74fdbb 100644 --- a/src/gui/tradewindow.cpp +++ b/src/gui/tradewindow.cpp @@ -27,8 +27,10 @@ #include "item.h" #include "localplayer.h" #include "playerinfo.h" +#include "playerrelations.h" #include "units.h" +#include "gui/gui.h" #include "gui/inventorywindow.h" #include "gui/itemamountwindow.h" #include "gui/setup.h" @@ -440,4 +442,6 @@ void TradeWindow::initTrade(std::string nick) } } clear(); + if (!player_relations.isGoodName(nick)) + setCaptionFont(gui->getSecureFont()); } diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index 2b6c4ef58..bdf3f5b7c 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -94,6 +94,7 @@ Window::Window(const std::string &caption, bool modal, Window *parent, setVisible(false); addWidgetListener(this); + mCaptionFont = getFont(); } Window::~Window() @@ -154,7 +155,7 @@ void Window::draw(gcn::Graphics *graphics) if (mShowTitle) { g->setColor(Theme::getThemeColor(Theme::TEXT)); - g->setFont(getFont()); + g->setFont(mCaptionFont); g->drawText(getCaption(), 7, 5, gcn::Graphics::LEFT); } diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h index f455f1238..4e9a6d87b 100644 --- a/src/gui/widgets/window.h +++ b/src/gui/widgets/window.h @@ -384,6 +384,9 @@ class Window : public gcn::Window, gcn::WidgetListener bool isResizeAllowed(gcn::MouseEvent &event); + void setCaptionFont(gcn::Font *font) + { mCaptionFont = font; } + private: enum ResizeHandles { @@ -442,6 +445,7 @@ class Window : public gcn::Window, gcn::WidgetListener static const unsigned resizeBorderWidth = 10; GraphicsVertexes *mVertexes; bool mRedraw; + gcn::Font *mCaptionFont; }; #endif -- cgit v1.2.3-60-g2f50