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

minor changes

Browse Source
This commit is contained in:
Jinhao 2016-05-22 21:30:46 +08:00
parent 0122a8b98b
commit 9aa37d5238
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/nana/gui/widgets/slider.hpp
View File

@ -38,12 +38,12 @@ namespace nana
: public widget_geometrics : public widget_geometrics
{ {
/// Colors /// Colors
color_proxy color_adorn{ static_cast<color_rgb>(0x3da3ce) }; color_proxy color_adorn { static_cast<color_rgb>(0x3da3ce) };
color_proxy color_bar{ static_cast<color_rgb>(0x878787) }; color_proxy color_bar { static_cast<color_rgb>(0x878787) };
color_proxy color_slider{ static_cast<color_rgb>(0x606060) }; color_proxy color_slider { static_cast<color_rgb>(0x606060) };
color_proxy color_slider_highlighted{ static_cast<color_rgb>(0x2d93be) }; color_proxy color_slider_highlighted{ static_cast<color_rgb>(0x2d93be) };
color_proxy color_vernier{ colors::red }; color_proxy color_vernier { colors::red };
color_proxy color_vernier_text{ colors::white }; color_proxy color_vernier_text { colors::white };
/// Geometrical parameters /// Geometrical parameters
unsigned vernier_text_margin{ 8 }; unsigned vernier_text_margin{ 8 };

5
source/paint/pixel_buffer.cpp
View File

@ -1,7 +1,7 @@
/* /*
* Pixel Buffer Implementation * Pixel Buffer Implementation
* Nana C++ Library(http://www.nanapro.org) * Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2014 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2003-2016 Jinhao(cnjinhao@hotmail.com)
* *
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
@ -1252,9 +1252,6 @@ namespace nana{ namespace paint
const int right_point = static_cast<int>(dest.x) + static_cast<int>(size_rotated.width); const int right_point = static_cast<int>(dest.x) + static_cast<int>(size_rotated.width);
const int source_right = static_cast<int>(sp->pixel_size.width);
const int source_bottom = static_cast<int>(sp->pixel_size.height);
for (point point_dest{ static_cast<int>(dest.x), static_cast<int>(dest.y) }; point_dest.x < right_point; ++point_dest.x) for (point point_dest{ static_cast<int>(dest.x), static_cast<int>(dest.y) }; point_dest.x < right_point; ++point_dest.x)
{ {
auto point_source = point_rotate.to(point_dest) + origin; auto point_source = point_rotate.to(point_dest) + origin;