summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/graphics/gui/CMakeLists.txt1
-rw-r--r--data/graphics/gui/Makefile.am1
-rw-r--r--data/graphics/gui/browserbox.xml6
-rw-r--r--src/gui/widgets/browserbox.cpp54
-rw-r--r--src/gui/widgets/browserbox.h5
5 files changed, 52 insertions, 15 deletions
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index 9f2f847da..6d1589365 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -1,4 +1,5 @@
SET (FILES
+ browserbox.xml
bubble.png
bubble.xml
button.xml
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index 69c07bda1..181def2cb 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -2,6 +2,7 @@
guidir = $(pkgdatadir)/data/graphics/gui
gui_DATA = \
+ browserbox.xml \
bubble.png \
bubble.xml \
button.xml \
diff --git a/data/graphics/gui/browserbox.xml b/data/graphics/gui/browserbox.xml
new file mode 100644
index 000000000..35e2ea9a5
--- /dev/null
+++ b/data/graphics/gui/browserbox.xml
@@ -0,0 +1,6 @@
+<skinset name="Default" image="window.png">
+ <widget type="Window">
+ <option name="padding" value="1" />
+ <option name="newLinePadding" value="15" />
+ </widget>
+</skinset>
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index 1fa563915..f8b6b0b06 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -41,6 +41,9 @@
#include "debug.h"
+Skin *BrowserBox::mSkin = nullptr;
+int BrowserBox::mInstances = 0;
+
BrowserBox::BrowserBox(const Widget2 *const widget, const unsigned int mode,
const bool opaque) :
gcn::Widget(),
@@ -60,6 +63,8 @@ BrowserBox::BrowserBox(const Widget2 *const widget, const unsigned int mode,
mAlwaysUpdate(true),
mProcessVersion(false),
mEnableImages(false),
+ mPadding(0),
+ mNewLinePadding(15),
mBackgroundColor(getThemeColor(Theme::BACKGROUND)),
mHighlightColor(getThemeColor(Theme::HIGHLIGHT)),
mHyperLinkColor(getThemeColor(Theme::HYPERLINK))
@@ -67,6 +72,19 @@ BrowserBox::BrowserBox(const Widget2 *const widget, const unsigned int mode,
setFocusable(true);
addMouseListener(this);
+ if (mInstances == 0)
+ {
+ if (Theme::instance())
+ mSkin = Theme::instance()->load("browserbox.xml", "");
+ }
+ mInstances ++;
+
+ if (mSkin)
+ {
+ mPadding = mSkin->getPadding();
+ mNewLinePadding = mSkin->getOption("newLinePadding", 15);
+ }
+
mColors[RED] = getThemeColor(Theme::RED);
mColors[GREEN] = getThemeColor(Theme::GREEN);
mColors[BLUE] = getThemeColor(Theme::BLUE);
@@ -81,6 +99,9 @@ BrowserBox::BrowserBox(const Widget2 *const widget, const unsigned int mode,
BrowserBox::~BrowserBox()
{
+ mInstances --;
+ if (mInstances == 0 && Theme::instance())
+ Theme::instance()->unload(mSkin);
}
void BrowserBox::setLinkHandler(LinkHandler* linkHandler)
@@ -246,7 +267,7 @@ void BrowserBox::addRow(const std::string &row, const bool atTop)
if ((x + nextWordWidth + 10)
> static_cast<unsigned>(getWidth()))
{
- x = 15; // Ident in new line
+ x = mNewLinePadding; // Ident in new line
y += 1;
j ++;
}
@@ -255,7 +276,7 @@ void BrowserBox::addRow(const std::string &row, const bool atTop)
else if ((x + 2 * hyphenWidth)
> static_cast<unsigned>(getWidth()))
{
- x = 15; // Ident in new line
+ x = mNewLinePadding; // Ident in new line
y += 1;
}
}
@@ -406,14 +427,15 @@ void BrowserBox::draw(gcn::Graphics *graphics)
int BrowserBox::calcHeight()
{
- unsigned x = 0, y = 0;
+ unsigned x = mPadding, y = mPadding;
int wrappedLines = 0;
int moreHeight = 0;
- int maxWidth = getWidth();
+ int maxWidth = getWidth() - mPadding;
int link = 0;
bool bold = false;
+ unsigned int wWidth = maxWidth;
- if (getWidth() < 0)
+ if (maxWidth < 0)
return 1;
const gcn::Font *const font = getFont();
@@ -434,13 +456,13 @@ int BrowserBox::calcHeight()
{
const std::string row = *(i);
bool wrapped = false;
- x = 0;
+ x = mPadding;
// Check for separator lines
if (row.find("---", 0) == 0)
{
const int dashWidth = fontWidthMinus;
- for (x = 0; x < static_cast<unsigned>(getWidth()); x ++)
+ for (x = mPadding; x < wWidth; x ++)
{
mLineParts.push_back(LinePart(x, y, selColor, "-", false));
x += dashWidth - 2;
@@ -480,7 +502,7 @@ int BrowserBox::calcHeight()
if (wrapped)
{
y += fontHeight;
- x = 15;
+ x = mNewLinePadding + mPadding;
wrapped = false;
}
@@ -573,8 +595,8 @@ int BrowserBox::calcHeight()
width = font->getWidth(part);
// Auto wrap mode
- if (mMode == AUTO_WRAP && getWidth() > 0 && width > 0
- && (x + width + 10) > static_cast<unsigned>(getWidth()))
+ if (mMode == AUTO_WRAP && wWidth > 0 && width > 0
+ && (x + width + 10) > wWidth)
{
bool forced = false;
@@ -607,13 +629,12 @@ int BrowserBox::calcHeight()
else
width = font->getWidth(part);
}
- while (end > start && width > 0 && (x + width + 10)
- > static_cast<unsigned>(getWidth()));
+ while (end > start && width > 0 && (x + width + 10) > wWidth);
if (forced)
{
x -= hyphenWidth; // Remove the wrap-notifier accounting
- mLineParts.push_back(LinePart(getWidth() - hyphenWidth,
+ mLineParts.push_back(LinePart(wWidth - hyphenWidth,
y, selColor, hyphen, bold));
end++; // Skip to the next character
}
@@ -640,11 +661,14 @@ int BrowserBox::calcHeight()
}
y += fontHeight;
}
- if (getWidth() != maxWidth)
+ if (wWidth != maxWidth)
+ {
+ wWidth = maxWidth;
setWidth(maxWidth);
+ }
return (static_cast<int>(mTextRows.size()) + wrappedLines)
- * fontHeight + moreHeight;
+ * fontHeight + moreHeight + 2 * mPadding;
}
void BrowserBox::updateHeight()
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index 591d83a07..bff0d97c3 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -230,11 +230,16 @@ class BrowserBox final : public gcn::Widget,
bool mAlwaysUpdate;
bool mProcessVersion;
bool mEnableImages;
+ int mPadding;
+ int mNewLinePadding;
gcn::Color mBackgroundColor;
gcn::Color mHighlightColor;
gcn::Color mHyperLinkColor;
gcn::Color mColors[COLORS_MAX];
+
+ static Skin *mSkin;
+ static int mInstances;
};
#endif
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-07 07:06:52 +0000