github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

GridCtrl: Pasting into column with Convert based EditField now uses Convert to convert the pasted text

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@10686 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2017-01-09 14:17:58 +00:00
parent f3d040a579
commit c43eca998a
1 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

32
uppsrc/GridCtrl/GridCtrl.cpp
View file

@ -825,10 +825,10 @@ void GridCtrl::Paste(int mode)
{
int pr = 0;
bool new_row = false;
for(int i = 0; i < lines.GetCount(); i++)
{
String line = TrimRight(lines[i]);
String line = TrimRight(lines[i]);
Vector<String> cells = Upp::Split(line, '\t', false);
for(int j = 0; j < cells.GetCount(); j++)
{
@ -849,7 +849,7 @@ void GridCtrl::Paste(int mode)
rowidx = lr;
new_row = lr >= tr || mode > 0;
if(fixed_paste && new_row)
break;
@ -2773,8 +2773,9 @@ void GridCtrl::SetFixedCols(int n)
}
}
void GridCtrl::Set0(int r, int c, const Value &val, bool paste)
void GridCtrl::Set0(int r, int c, const Value &val_, bool paste)
{
Value val = val_;
if(c > total_cols - 1)
return;
if(r > total_rows - 1)
@ -2785,18 +2786,25 @@ void GridCtrl::Set0(int r, int c, const Value &val, bool paste)
int ri = vitems[r].id;
Item &it = items[ri][c];
if(it.isjoined)
{
if(it.isjoined) {
ri = it.idy;
c = it.idx;
}
Ctrl * ctrl = items[ri][c].ctrl;
if(ctrl)
ctrl->SetData(val);
else
{
Ctrl *ctrl = items[ri][c].ctrl;
bool setctrl = true;
if(!ctrl) {
ctrl = edits[c].ctrl;
if(ctrl && ctrlid.y == ri)
setctrl = ctrlid.y == ri;
}
if(ctrl) {
if(paste && IsString(val)) {
Convert *cv = dynamic_cast<Convert *>(ctrl);
if(cv)
val = cv->Scan(val);
}
if(setctrl)
ctrl->SetData(val);
}