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

replace string parameter of image's constructor with filesystem::path

Browse Source
This commit is contained in:
Jinhao
2015-11-30 00:58:29 +08:00
parent c86a00bea5
commit b35f293b9e
11 changed files with 103 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/gui/detail/window_manager.cpp
View File

@@ -463,10 +463,10 @@ namespace detail
}
}
void window_manager::default_icon(const nana::paint::image& small, const nana::paint::image& big)
void window_manager::default_icon(const nana::paint::image& small_icon, const nana::paint::image& big_icon)
{
impl_->default_icon_big = big;
impl_->default_icon_small = small;
impl_->default_icon_big = big_icon;
impl_->default_icon_small = small_icon;
}
void window_manager::icon(core_window_t* wd, const paint::image& small_icon, const paint::image& big_icon)

2
source/gui/place.cpp
View File

@@ -1014,7 +1014,7 @@ namespace nana
auto find_lowest = [&revises](double level_px)
{
double v = std::numeric_limits<double>::max();
double v = (std::numeric_limits<double>::max)();
for (auto i = revises.begin(); i != revises.end(); ++i)
{
if (i->min_px >= 0 && i->min_px < v && i->min_px > level_px)

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

@@ -3155,7 +3155,7 @@ namespace nana
graph->rectangle(rectangle{ item_xpos + static_cast<int>(header.pixels), y + 2,
ts.width + static_cast<unsigned>(content_pos)-header.pixels, essence_->item_size - 4 }, true);
}
extreme_text = std::max(extreme_text, item_xpos + content_pos + ts.width);
extreme_text = (std::max)(extreme_text, item_xpos + content_pos + ts.width);
}
}
}