Commit 91f6329 1 parent ccaca80 commit 91f6329 Copy full SHA for 91f6329
File tree 2 files changed +6
-6
lines changed
2 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -742,11 +742,11 @@ namespace detail
742
742
unsigned width = static_cast <unsigned >(r->right - r->left ) - wd->extra_width ;
743
743
unsigned height = static_cast <unsigned >(r->bottom - r->top ) - wd->extra_height ;
744
744
745
- if (wd->max_track_size .width && (wd->max_track_size .width < req_width)) req_width = wd->max_track_size .width ;
746
- else if (wd->min_track_size .width && (wd->min_track_size .width > req_width)) req_width = wd->min_track_size .width ;
745
+ if (wd->max_track_size .width && (wd->max_track_size .width < req_width )) req_width = wd->max_track_size .width ;
746
+ if (wd->min_track_size .width && (wd->min_track_size .width > req_width )) req_width = wd->min_track_size .width ;
747
747
748
- if (wd->max_track_size .height && (wd->max_track_size .height < req_height)) req_height = wd->max_track_size .height ;
749
- else if (wd->min_track_size .height && (wd->min_track_size .height > req_height)) req_height = wd->min_track_size .height ;
748
+ if (wd->max_track_size .height && (wd->max_track_size .height < req_height)) req_height = wd->max_track_size .height ;
749
+ if (wd->min_track_size .height && (wd->min_track_size .height > req_height)) req_height = wd->min_track_size .height ;
750
750
751
751
if (req_width != width)
752
752
{
Original file line number Diff line number Diff line change @@ -233,8 +233,8 @@ namespace nana
233
233
};
234
234
235
235
drawer::drawer (int dpi)
236
- : data_impl_{ new data_implement },
237
- graphics{ dpi }
236
+ : graphics{ dpi },
237
+ data_impl_{ new data_implement }
238
238
{}
239
239
240
240
drawer::~drawer ()
You can’t perform that action at this time.
0 commit comments