From 239de381348cba9f2dc114a8f1b9496fea456131 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 19 Jun 2017 20:14:20 +0300
Subject: Use staticbrowserbox in questswindow.
---
src/gui/windows/questswindow.cpp | 5 +++--
src/gui/windows/questswindow.h | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
(limited to 'src')
diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp
index 5515489e6..615c23d64 100644
--- a/src/gui/windows/questswindow.cpp
+++ b/src/gui/windows/questswindow.cpp
@@ -36,7 +36,6 @@
#include "gui/windows/setupwindow.h"
-#include "gui/widgets/browserbox.h"
#include "gui/widgets/button.h"
#include "gui/widgets/containerplacer.h"
#include "gui/widgets/createwidget.h"
@@ -44,6 +43,7 @@
#include "gui/widgets/extendedlistbox.h"
#include "gui/widgets/itemlinkhandler.h"
#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/staticbrowserbox.h"
#include "utils/delete2.h"
#include "utils/gettext.h"
@@ -70,7 +70,7 @@ QuestsWindow::QuestsWindow() :
fromBool(getOptionBool("showlistbackground"), Opaque),
"quests_list_background.xml")),
mItemLinkHandler(new ItemLinkHandler),
- mText(new BrowserBox(this, BrowserBoxMode::AUTO_WRAP, Opaque_true,
+ mText(new StaticBrowserBox(this, Opaque_true,
"browserbox.xml")),
mTextScrollArea(new ScrollArea(this, mText,
fromBool(getOptionBool("showtextbackground"), Opaque),
@@ -365,6 +365,7 @@ void QuestsWindow::showQuest(const QuestItem *const quest)
break;
}
}
+ mText->updateHeight();
}
void QuestsWindow::setMap(const Map *const map)
diff --git a/src/gui/windows/questswindow.h b/src/gui/windows/questswindow.h
index 10e020820..b5be44d12 100644
--- a/src/gui/windows/questswindow.h
+++ b/src/gui/windows/questswindow.h
@@ -33,11 +33,11 @@
class Being;
class Button;
-class BrowserBox;
class ExtendedListBox;
class ItemLinkHandler;
class Map;
class ScrollArea;
+class StaticBrowserBox;
class QuestsModel;
struct QuestEffect;
@@ -81,7 +81,7 @@ class QuestsWindow final : public Window,
ExtendedListBox *mQuestsListBox A_NONNULLPOINTER;
ScrollArea *mQuestScrollArea A_NONNULLPOINTER;
ItemLinkHandler *mItemLinkHandler A_NONNULLPOINTER;
- BrowserBox *mText A_NONNULLPOINTER;
+ StaticBrowserBox *mText A_NONNULLPOINTER;
ScrollArea *mTextScrollArea A_NONNULLPOINTER;
Button *mCloseButton A_NONNULLPOINTER;
Image *mCompleteIcon;
--
cgit v1.2.3-70-g09d2