summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-07 23:37:06 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-07 23:37:06 +0300
commit661ae1c08d0cab92011e1913e587901c51aee5fe (patch)
tree10c5bc4db6e767a5232d2c1056c1af578848fc74
parent2538267ce30c5cfe3bbf23442e7c3a80e647f260 (diff)
downloadplus-661ae1c08d0cab92011e1913e587901c51aee5fe.tar.gz
plus-661ae1c08d0cab92011e1913e587901c51aee5fe.tar.bz2
plus-661ae1c08d0cab92011e1913e587901c51aee5fe.tar.xz
plus-661ae1c08d0cab92011e1913e587901c51aee5fe.zip
Fix confirm dialog width if caption too big.
-rw-r--r--src/gui/widgets/window.cpp4
-rw-r--r--src/gui/widgets/window.h4
-rw-r--r--src/gui/windows/confirmdialog.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 9de9b431f..1c63bba31 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -123,6 +123,8 @@ Window::Window(const std::string &caption,
mDefaultY(0),
mDefaultWidth(0),
mDefaultHeight(0),
+ mCaptionOffsetX(7),
+ mCaptionOffsetY(5),
mShowTitle(true),
mLastRedraw(true),
mGrip(nullptr),
@@ -138,8 +140,6 @@ Window::Window(const std::string &caption,
mMaxWinWidth(mainGraphics->mWidth),
mMaxWinHeight(mainGraphics->mHeight),
mVertexes(new ImageCollection),
- mCaptionOffsetX(7),
- mCaptionOffsetY(5),
mCaptionAlign(Graphics::LEFT),
mTitlePadding(4),
mGripPadding(2),
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index 75f4b81fb..06a0d3295 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -643,6 +643,8 @@ class Window notfinal : public BasicContainer2,
int mDefaultY; /**< Default window Y position */
int mDefaultWidth; /**< Default window width */
int mDefaultHeight; /**< Default window height */
+ int mCaptionOffsetX;
+ int mCaptionOffsetY;
bool mShowTitle; /**< Window has a title bar */
bool mLastRedraw;
@@ -698,8 +700,6 @@ class Window notfinal : public BasicContainer2,
*/
static const unsigned resizeBorderWidth = 10;
ImageCollection *mVertexes A_NONNULLPOINTER;
- int mCaptionOffsetX;
- int mCaptionOffsetY;
Graphics::Alignment mCaptionAlign;
int mTitlePadding;
int mGripPadding;
diff --git a/src/gui/windows/confirmdialog.cpp b/src/gui/windows/confirmdialog.cpp
index e08177ef4..4a0936c0c 100644
--- a/src/gui/windows/confirmdialog.cpp
+++ b/src/gui/windows/confirmdialog.cpp
@@ -70,7 +70,7 @@ void ConfirmDialog::postInit()
const int fontHeight = getFont()->getHeight();
const int height = numRows * fontHeight;
- int width = getFont()->getWidth(getCaption());
+ int width = getFont()->getWidth(getCaption()) + mCaptionOffsetX;
if (width < mTextBox->getMinWidth())
width = mTextBox->getMinWidth();