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

Merge remote-tracking branch 'cnjinhao/hotfix-1.3' into hotfix-1.3

Browse Source
This commit is contained in:
qPCR4vir
2016-03-23 17:24:14 +01:00
parent db9167bb21 735f1e97fa
commit 4b2657246d
7 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/datetime.cpp
View File

@@ -57,7 +57,7 @@ namespace nana
}
date::date()
: value_(to_dateval(*std::localtime(nullptr)))
: value_(to_dateval(localtime()))
{
}

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

@@ -3436,6 +3436,9 @@ namespace nana
if (lister.forward(essence_->scroll.offset_y_dpl, ptr_where.second, item_pos))
{
auto * item_ptr = (item_pos.is_item() ? &lister.at(item_pos) : nullptr);
const index_pair abs_item_pos{ item_pos.cat, lister.absolute(item_pos) };
if(ptr_where.first == parts::lister)
{
bool sel = true;
@@ -3444,28 +3447,32 @@ namespace nana
if (arg.shift)
lister.select_display_range(lister.last_selected_abs , item_pos, sel);
else if (arg.ctrl)
sel = !item_proxy(essence_, index_pair (item_pos.cat, lister.absolute(item_pos))).selected();
sel = !item_proxy(essence_, abs_item_pos).selected();
else
lister.select_for_all(false); //cancel all selections
}
else
sel = !item_proxy(essence_, index_pair (item_pos.cat, lister.absolute(item_pos))).selected();
{
//Clicking on a category is ignored when single selection is enabled.
//Fixed by Greentwip(issue #121)
if (item_ptr)
sel = !item_proxy(essence_, abs_item_pos).selected();
}
if(item_ptr)
{
item_ptr->flags.selected = sel;
index_pair last_selected(item_pos.cat, lister.absolute(item_pos));
arg_listbox arg{item_proxy{essence_, last_selected}, sel};
arg_listbox arg{ item_proxy{ essence_, abs_item_pos }, sel };
lister.wd_ptr()->events().selected.emit(arg);
if (item_ptr->flags.selected)
{
lister.cancel_others_if_single_enabled(true, last_selected);
essence_->lister.last_selected_abs = last_selected;
lister.cancel_others_if_single_enabled(true, abs_item_pos);
essence_->lister.last_selected_abs = abs_item_pos;
}
else if (essence_->lister.last_selected_abs == last_selected)
else if (essence_->lister.last_selected_abs == abs_item_pos)
essence_->lister.last_selected_abs.set_both(npos);
}
else if(!lister.single_selection())
@@ -3476,13 +3483,11 @@ namespace nana
if(item_ptr)
{
item_ptr->flags.checked = ! item_ptr->flags.checked;
index_pair abs_pos{ item_pos.cat, lister.absolute(item_pos) };
arg_listbox arg{ item_proxy{ essence_, abs_pos }, item_ptr->flags.checked };
arg_listbox arg{ item_proxy{ essence_, abs_item_pos }, item_ptr->flags.checked };
lister.wd_ptr()->events().checked.emit(arg);
if (item_ptr->flags.checked)
lister.cancel_others_if_single_enabled(false, abs_pos);
lister.cancel_others_if_single_enabled(false, abs_item_pos);
}
else if (! lister.single_check())
lister.categ_checked_reverse(item_pos.cat);

3
source/gui/wvl.cpp
View File

@@ -13,8 +13,9 @@
#include <nana/gui/wvl.hpp>
#include <nana/gui/detail/bedrock.hpp>
#include <thread>
#include <nana/std_thread.hpp>
#include <iostream>
#include <chrono>
//#define NANA_AUTOMATIC_GUI_TESTING
namespace nana

1
source/system/dataexch.cpp
View File

@@ -15,6 +15,7 @@
#include <nana/paint/graphics.hpp>
#include <vector>
#include <cassert>
#include <cstring>
#if defined(NANA_WINDOWS)
#include <windows.h>