mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FIX https://github.com/cnjinhao/nana/issues/465

Browse Source
This commit is contained in:
qPCR4vir 2019-08-01 14:00:54 +02:00
parent ba1af33d76
commit 0b339c1552
1 changed files with 54 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
source/gui/msgbox.cpp
View File

@ -1,4 +1,4 @@
/* /**
* A Message Box Class * A Message Box Class
* Nana C++ Library(http://www.nanapro.org) * Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com)
@ -7,11 +7,16 @@
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt) * http://www.boost.org/LICENSE_1_0.txt)
* *
* @file: nana/gui/msgbox.hpp * @file nana/gui/msgbox.hpp
* @Contributors * @Contributors
* James Bremner * James Bremner
* Ariel Vina-Rodriguez
*/ */
#include <algorithm> // max
#include <functional>
#include <cstdlib> //include std::abs
#include <nana/gui/compact.hpp> #include <nana/gui/compact.hpp>
#include <nana/gui/msgbox.hpp> #include <nana/gui/msgbox.hpp>
#include <nana/gui/drawing.hpp> #include <nana/gui/drawing.hpp>
@ -27,8 +32,7 @@
#include <nana/datetime.hpp> #include <nana/datetime.hpp>
#include <nana/internationalization.hpp> #include <nana/internationalization.hpp>
#include <nana/gui/filebox.hpp> #include <nana/gui/filebox.hpp>
#include <functional>
#include <cstdlib> //include std::abs
#if defined(NANA_WINDOWS) #if defined(NANA_WINDOWS)
#include <windows.h> #include <windows.h>
#elif defined(NANA_X11) #elif defined(NANA_X11)
@ -494,21 +498,29 @@ namespace nana
//end class msgbox //end class msgbox
//class inputbox //class inputbox todo: add schema
class inputbox_window class inputbox_window
: public ::nana::form : public ::nana::form
{ {
public: public:
inputbox_window(window owner, paint::image (&imgs)[4], ::nana::rectangle (&valid_areas)[4], const ::std::string & desc, const ::std::string& title, std::size_t contents, unsigned fixed_pixels, const std::vector<unsigned>& each_height) inputbox_window(window owner,
paint::image (&imgs)[4], ///< 4 ref to images
::nana::rectangle (&valid_areas)[4],
const ::std::string & description,
const ::std::string& title,
std::size_t contents,
unsigned fixed_pixels,
const std::vector<unsigned>& each_height)
: form(owner, API::make_center(owner, 500, 300), appear::decorate<>()) : form(owner, API::make_center(owner, 500, 300), appear::decorate<>())
{ {
throw_not_utf8(desc); throw_not_utf8(description);
throw_not_utf8(title); throw_not_utf8(title);
desc_.create(*this); description_.create(*this);
desc_.format(true).caption(desc); description_.format(true).caption(description);
auto desc_extent = desc_.measure(470); auto description_size = description_.measure(470);
btn_ok_.create(*this); btn_ok_.create(*this);
btn_ok_.i18n(i18n_eval("NANA_BUTTON_OK")); btn_ok_.i18n(i18n_eval("NANA_BUTTON_OK"));
@ -527,32 +539,26 @@ namespace nana
close(); close();
}); });
unsigned height = 20 + desc_extent.height + 10 + 38; unsigned height = 20 + description_size.height + 10 + 38;
std::stringstream ss_content; std::stringstream ss_content;
ss_content << "<margin=10 vert <desc weight=" << desc_extent.height << "><vert margin=[10]";
for (std::size_t i = 0; i < contents; ++i) for (std::size_t i = 0; i < contents; ++i)
{ {
unsigned px = 27; unsigned px = std::max(27u, each_height[i]);
if (each_height[i] > 27)
px = each_height[i];
ss_content << "<weight=" << (px + 3) << " margin=[3] input_" << i << ">"; ss_content << "<height=" << (px + 3) << " margin=[3] input_" << i << ">";
height += px + 1; height += px + 3;
} }
ss_content << "><margin=[15] weight=38<><buttons arrange=80 gap=10 weight=170>>>"; if (description_size.width < 200)
description_size.width = 200;
if (desc_extent.width < 200)
desc_extent.width = 200;
//Make sure the complete display of input extent //Make sure the complete display of input extent
if (desc_extent.width < fixed_pixels) if (description_size.width < fixed_pixels)
desc_extent.width = fixed_pixels; description_size.width = fixed_pixels;
desc_extent.width += 20; description_size.width += 20; // 2x margin 10
::nana::size img_sz[4]; ::nana::size img_sz[4];
@ -566,8 +572,9 @@ namespace nana
} }
else else
sz = imgs[2].size(); sz = imgs[2].size();
sz.width = static_cast<size::value_type>(double(sz.width) * (double(height) / double(sz.height))); const double scale_factor = double(height) / double(sz.height);
desc_extent.width += sz.width; sz.width = static_cast<size::value_type>(double(sz.width) * scale_factor);
description_size.width += sz.width;
} }
if (imgs[3]) //Right if (imgs[3]) //Right
@ -581,7 +588,7 @@ namespace nana
else else
sz = imgs[3].size(); sz = imgs[3].size();
sz.width = static_cast<size::value_type>(double(sz.width) * (double(height) / double(sz.height))); sz.width = static_cast<size::value_type>(double(sz.width) * (double(height) / double(sz.height)));
desc_extent.width += sz.width; description_size.width += sz.width;
} }
if (imgs[0]) //Top if (imgs[0]) //Top
@ -594,7 +601,8 @@ namespace nana
} }
else else
sz = imgs[0].size(); sz = imgs[0].size();
sz.height = static_cast<size::value_type>(double(sz.height) * (double(desc_extent.width) / double(sz.width))); const double scale_factor = double(description_size.width) / double(sz.width);
sz.height = static_cast<size::value_type>(double(sz.height) * scale_factor );
height += sz.height; height += sz.height;
} }
@ -608,16 +616,28 @@ namespace nana
} }
else else
sz = imgs[1].size(); sz = imgs[1].size();
sz.height = static_cast<size::value_type>(double(sz.height) * (double(desc_extent.width) / double(sz.width))); const double scale_factor = double(description_size.width) / double(sz.width);
sz.height = static_cast<size::value_type>(double(sz.height) * scale_factor);
height += sz.height; height += sz.height;
} }
std::stringstream ss; std::stringstream ss;
ss << "vert<img_top weight="<<img_sz[0].height<<"><<img_left weight="<<img_sz[2].width<<">"<<ss_content.str()<<"<img_right weight="<<img_sz[3].width<<">><img_bottom weight="<<img_sz[1].height<<">"; ss << "vert< img_top height="<<img_sz[0].height<<">"
<<" << img_left width=" <<img_sz[2].width <<">"
<<" <margin=10 vert <description height=" << description_size.height << ">" // added height: 2x10
<<" <vert margin=[10]" // added height: 10
<< ss_content.str()
<<" >"
<<" <height=38 margin=[15] <><width=170 buttons arrange=80 gap=10>"
<<" >>" // added height: 38
<<" < img_right width=" <<img_sz[3].width
<<" >>< img_bottom height="<<img_sz[1].height<<">";
// added height: 10 x3 = 30 + 38
auto& place = this->get_place(); auto& place = this->get_place();
place.div(ss.str().c_str()); place.div(ss.str().c_str());
place["desc"] << desc_; place["description"] << description_;
place["buttons"] << btn_ok_ << btn_cancel_; place["buttons"] << btn_ok_ << btn_cancel_;
const char * img_fields[4] = {"img_top", "img_bottom", "img_left", "img_right"}; const char * img_fields[4] = {"img_top", "img_bottom", "img_left", "img_right"};
@ -635,7 +655,7 @@ namespace nana
place.field_display(img_fields[i], imgs[i]); place.field_display(img_fields[i], imgs[i]);
} }
move(API::make_center(this->owner(), desc_extent.width, height)); move(API::make_center(this->owner(), description_size.width, height));
caption(title); caption(title);
} }
@ -659,7 +679,7 @@ namespace nana
return valid_input_; return valid_input_;
} }
private: private:
::nana::label desc_; ::nana::label description_;
::nana::button btn_ok_; ::nana::button btn_ok_;
::nana::button btn_cancel_; ::nana::button btn_cancel_;
bool valid_input_{ false }; bool valid_input_{ false };