summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-01-27 18:05:52 +0300
committerAndrei Karas <akaras@inbox.ru>2017-01-27 18:05:52 +0300
commit6917c126fbee146183433367be9a3d8fef94a1dd (patch)
tree1ae1ca8f031e7ce576a1f6a2bf82c0c97e23eefc /src/gui
parentf3cec08689d531cf6fe2c9edc733fa8b00032631 (diff)
downloadmanaplus-6917c126fbee146183433367be9a3d8fef94a1dd.tar.gz
manaplus-6917c126fbee146183433367be9a3d8fef94a1dd.tar.bz2
manaplus-6917c126fbee146183433367be9a3d8fef94a1dd.tar.xz
manaplus-6917c126fbee146183433367be9a3d8fef94a1dd.zip
Move link highlight mode into separate file.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/browserbox.cpp16
-rw-r--r--src/gui/widgets/browserbox.h12
2 files changed, 10 insertions, 18 deletions
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index c443bf07d..e1bb330e4 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -29,6 +29,8 @@
#include "const/resources/item/cards.h"
+#include "enums/gui/linkhighlightmode.h"
+
#include "input/inputmanager.h"
#include "gui/gui.h"
@@ -110,7 +112,7 @@ BrowserBox::BrowserBox(const Widget2 *const widget,
mLinkHandler(nullptr),
mSkin(nullptr),
mMode(mode),
- mHighMode(0),
+ mHighlightMode(0),
mSelectedLink(-1),
mMaxRows(0),
mHeight(0),
@@ -155,9 +157,9 @@ BrowserBox::BrowserBox(const Widget2 *const widget,
mSkin->getOption("newLinePadding", 15));
mItemPadding = mSkin->getOption("itemPadding");
if (mSkin->getOption("highlightBackground"))
- mHighMode |= BACKGROUND;
+ mHighlightMode |= LinkHighlightMode::BACKGROUND;
if (mSkin->getOption("highlightUnderline"))
- mHighMode |= UNDERLINE;
+ mHighlightMode |= LinkHighlightMode::UNDERLINE;
}
readColor(BLACK);
@@ -564,10 +566,10 @@ void BrowserBox::draw(Graphics *const graphics)
mDimension.width, mDimension.height));
}
- if (mSelectedLink >= 0 && mSelectedLink
- < CAST_S32(mLinks.size()))
+ if (mSelectedLink >= 0 &&
+ mSelectedLink < CAST_S32(mLinks.size()))
{
- if ((mHighMode & BACKGROUND))
+ if ((mHighlightMode & LinkHighlightMode::BACKGROUND))
{
BrowserLink &link = mLinks[CAST_SIZE(mSelectedLink)];
graphics->setColor(mHighlightColor);
@@ -578,7 +580,7 @@ void BrowserBox::draw(Graphics *const graphics)
link.y2 - link.y1));
}
- if ((mHighMode & UNDERLINE))
+ if ((mHighlightMode & LinkHighlightMode::UNDERLINE))
{
BrowserLink &link = mLinks[CAST_SIZE(mSelectedLink)];
graphics->setColor(mHyperLinkColor);
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index 77f103d83..fe0c0c36d 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -129,16 +129,6 @@ class BrowserBox final : public Widget,
COLORS_MAX
};
- /**
- * Highlight modes for links.
- * This can be used for a bitmask.
- */
- enum
- {
- UNDERLINE = 1,
- BACKGROUND = 2
- };
-
typedef std::list<std::string> TextRows;
TextRows &getRows() noexcept2 A_WARN_UNUSED
@@ -199,7 +189,7 @@ class BrowserBox final : public Widget,
LinkHandler *mLinkHandler;
Skin *mSkin;
BrowserBoxModeT mMode;
- unsigned int mHighMode;
+ unsigned int mHighlightMode;
int mSelectedLink;
unsigned int mMaxRows;
int mHeight;