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

fix combox content measure

Browse Source
This commit is contained in:
Jinhao 2017-04-29 01:50:56 +08:00
parent 2c318e2d33
commit 58cb215f7b
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/gui/widgets/combox.cpp
View File

@ -111,13 +111,7 @@ namespace nana
size extension() const override size extension() const override
{ {
auto text_size = drw_->editor()->text_area(false).dimension(); return{ 19, 4 };
auto wdg_size = drw_->widget_ptr()->size();
return{
wdg_size.width > text_size.width ? wdg_size.width - text_size.width : 0,
wdg_size.height > text_size.height ? wdg_size.height - text_size.height : 0
};
} }
private: private:
drawer_impl* const drw_; drawer_impl* const drw_;
@ -185,7 +179,9 @@ namespace nana
void text_area(const nana::size& s) void text_area(const nana::size& s)
{ {
nana::rectangle r(2, 2, s.width > 19 ? s.width - 19 : 0, s.height > 4 ? s.height - 4 : 0); auto extension = measurer_->extension();
nana::rectangle r(2, 2, s.width > extension.width ? s.width - extension.width : 0, s.height > extension.height ? s.height - extension.height : 0);
if(image_enabled_) if(image_enabled_)
{ {
unsigned place = image_pixels_ + 2; unsigned place = image_pixels_ + 2;

2
source/gui/widgets/listbox.cpp
View File

@ -3541,7 +3541,7 @@ namespace nana
if (item_state::highlighted == state) if (item_state::highlighted == state)
{ {
if (item.flags.selected) if (item.flags.selected)
bgcolor = bgcolor.blend(colors::black, 0.1); bgcolor = bgcolor.blend(essence_->scheme_ptr->item_highlighted, 0.5);
else else
bgcolor = bgcolor.blend(essence_->scheme_ptr->item_highlighted, 0.7); bgcolor = bgcolor.blend(essence_->scheme_ptr->item_highlighted, 0.7);
} }