From e3c9839fb10cacf7c07f08e18d0c84c2e16fb828 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 28 Jul 2013 19:05:15 +0300 Subject: move bools in browserbox. --- src/gui/widgets/browserbox.cpp | 18 +++++++++--------- src/gui/widgets/browserbox.h | 17 +++++++++-------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 2de1dcfae..fd4af6620 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -59,25 +59,25 @@ BrowserBox::BrowserBox(const Widget2 *const widget, const unsigned int mode, mLinkHandler(nullptr), mMode(mode), mHighMode(UNDERLINE | BACKGROUND), - mOpaque(opaque), - mUseLinksAndUserColors(true), - mUseEmotes(true), mSelectedLink(-1), mMaxRows(0), mHeight(0), mWidth(0), mYStart(0), mUpdateTime(-1), - mAlwaysUpdate(true), - mProcessVersion(false), - mEnableImages(false), - mEnableKeys(false), - mEnableTabs(false), mPadding(0), mNewLinePadding(15), mBackgroundColor(getThemeColor(Theme::BACKGROUND)), mHighlightColor(getThemeColor(Theme::HIGHLIGHT)), - mHyperLinkColor(getThemeColor(Theme::HYPERLINK)) + mHyperLinkColor(getThemeColor(Theme::HYPERLINK)), + mOpaque(opaque), + mUseLinksAndUserColors(true), + mUseEmotes(true), + mAlwaysUpdate(true), + mProcessVersion(false), + mEnableImages(false), + mEnableKeys(false), + mEnableTabs(false) { setFocusable(true); addMouseListener(this); diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h index 89865d18a..3a6c7972b 100644 --- a/src/gui/widgets/browserbox.h +++ b/src/gui/widgets/browserbox.h @@ -256,20 +256,12 @@ class BrowserBox final : public gcn::Widget, LinkHandler *mLinkHandler; unsigned int mMode; unsigned int mHighMode; - bool mOpaque; - bool mUseLinksAndUserColors; - bool mUseEmotes; int mSelectedLink; unsigned int mMaxRows; int mHeight; int mWidth; int mYStart; int mUpdateTime; - bool mAlwaysUpdate; - bool mProcessVersion; - bool mEnableImages; - bool mEnableKeys; - bool mEnableTabs; int mPadding; int mNewLinePadding; @@ -278,6 +270,15 @@ class BrowserBox final : public gcn::Widget, gcn::Color mHyperLinkColor; gcn::Color mColors[2][COLORS_MAX]; + bool mOpaque; + bool mUseLinksAndUserColors; + bool mUseEmotes; + bool mAlwaysUpdate; + bool mProcessVersion; + bool mEnableImages; + bool mEnableKeys; + bool mEnableTabs; + static Skin *mSkin; static ImageSet *mEmotes; static int mInstances; -- cgit v1.2.3-70-g09d2