}
};
property int sortOrder { get { return this ? sortOrder : 0; } };
- property char * header
+ property const char * header
{
set
{
{
if(prev != after)
{
- int position = 0;
- DataField field;
-
listBox.fields.Move(this, after);
// Fix up positions
if(cell && cell.isSet && dataType)
{
static char tempString[4096];
- String string;
+ const String string;
int tw = 0;
if(dataType.type == normalClass || dataType.type == noHeadClass)
- string = ((char *(*)(void *, void *, char *, void *, bool *))(void *)dataType._vTbl[__ecereVMethodID_class_OnGetString])(dataType, cell.data[0], tempString, userData, null);
+ string = ((const char *(*)(void *, void *, char *, void *, bool *))(void *)dataType._vTbl[__ecereVMethodID_class_OnGetString])(dataType, cell.data[0], tempString, userData, null);
else
- string = ((char *(*)(void *, void *, char *, void *, bool *))(void *)dataType._vTbl[__ecereVMethodID_class_OnGetString])(dataType, cell.data, tempString, userData, null);
+ string = ((const char *(*)(void *, void *, char *, void *, bool *))(void *)dataType._vTbl[__ecereVMethodID_class_OnGetString])(dataType, cell.data, tempString, userData, null);
if(string)
display.FontExtent(row.header ? boldFont : font, string, strlen(string), &tw, null);
else
}
DataField prev, next;
- char * header;
+ const char * header;
Class dataType;
int width;
uint index;
property DataRow previous { get { return prev; } };
property DataRow next { get { return next; } };
property int index { get { return (this && (!parent || parent.IsExpanded())) ? index : -1; } };
- property char * string
+ property const char * string
{
set { SetData(listBox.fields.first, value); }
get { return GetData(listBox.fields.first); }
if(listBox && prev != after)
{
DataRow search;
- int afterIndex = -1;
int headerSize = ((listBox.style.header) ? listBox.rowHeight : 0);
int height = listBox.clientSize.h + 1 - headerSize;
int ixCount = (!collapsed && subRows.count) ? GetLastRow().index - index + 1 : 1;
if(!after || after.index < index)
{
- if(after == listBox.firstRowShown.prev)
+ if((after && after == listBox.firstRowShown.prev) || (!after && !parent && listBox.firstRowShown.prev))
listBox.firstRowShown = this;
// All rows between AFTER (exclusive) and ROW (exclusive) are incremented by one
// ROW is equal to AFTER's index + 1
- for(search = after ? after.next : listBox.rows.first; search && search != this; search = search.GetNextRow())
+ for(search = after ? after.next : (parent ? parent.subRows.first : listBox.rows.first); search && search != this; search = search.GetNextRow())
search.index += ixCount;
if(after && after.subRows.first && !after.collapsed)
index = search.index + 1;
}
else
- index = after ? (after.index + 1) : 0;
+ index = after ? (after.index + 1) : parent ? parent.index + 1 : 0;
// Fix indices of sub rows
if(!collapsed)
}
else
{
- DataRow nextRow = GetNextRow();
+ DataRow nextRow;
+ int afterIXCount = 1;
+
+ nextRow = GetNextRow();
if(this == listBox.firstRowShown)
listBox.firstRowShown = nextRow;
- index = after.index;
// All rows between ROW (exclusive) and AFTER (inclusive) are decremented by one
// ROW is equal to AFTER's index
search.index -= ixCount;
if(search == after) break;
}
+
+ // Fix up's after's sub rows
+ if(after && !after.collapsed)
+ {
+ DataRow last = after.GetLastRow();
+ if(last != after)
+ {
+ int ix = after.index+1;
+ for(search = after.GetNextRow(); search; search = search.GetNextRow())
+ {
+ afterIXCount++;
+ search.index = ix++;
+ if(search == last) break;
+ }
+ }
+ }
+ index = after.index + afterIXCount;
+
+ // Fix indices of sub rows
+ if(!collapsed)
+ {
+ int c, ix = index+1;
+ for(c = 1, search = GetNextRow(); search && c < ixCount; c++, search = search.GetNextRow())
+ search.index = ix++;
+ }
}
- listBox.rows.Move(this, after);
+ (parent ? parent.subRows : listBox.rows).Move(this, after);
#ifdef _DEBUG
listBox.CheckConsistency();
if((field.dataType.type == normalClass || field.dataType.type == noHeadClass))
return cell.data[0];
else
- return (void *)cell.data; // Cast for MemoryGuard
+ return cell.data;
}
}
return null;
listBox.modifiedDocument = true;
listBox.Update(null);
if(dataType && (dataType.type == normalClass || dataType.type == noHeadClass))
- return (void *)cell.data; // Cast for MemoryGuard
+ return cell.data;
else
return &cell.data;
}
(sizeof(class ListBoxCell) + field.dataType.typeSize - sizeof(void *)) : sizeof(class ListBoxCell);
ListBoxCell cell = (ListBoxCell)new0 byte[size];
row.cells.Add(cell);
- FillBytes(cell.data, 0, size - (uint)&((ListBoxCell)0).data);
+ FillBytes(cell.data, 0, size - (uint)(uintptr)&((ListBoxCell)0).data);
cell.isSet = false;
}
}
return null;
}
- DataRow AddStringf(char * format, ...)
+ DataRow AddStringf(const char * format, ...)
{
if(this)
{
return null;
}
- DataRow AddString(char * string)
+ DataRow AddString(const char * string)
{
if(this)
{
private:
DataRow()
{
- subRows.offset = (uint)&((DataRow)0).prev;
+ subRows.offset = (uint)(uintptr)&((DataRow)0).prev;
}
~DataRow()
virtual bool Window::NotifyKeyHit(ListBox listBox, DataRow row, Key key, unichar ch);
virtual bool Window::NotifyModified(ListBox listBox, DataRow row);
virtual bool Window::NotifyEditing(ListBox listBox, DataRow row);
+ virtual void Window::NotifyMoved(ListBox listBox, DataRow row, Modifiers mods);
#ifdef _DEBUG
private void CheckConsistency()
stayOnTop = true;
inactive = true;
dontScrollVert = true;
- id = (uint64)addedField;
+ id = (int64)(intptr)addedField;
text = addedField.header;
bevel = (!guiApp.textMode && !style.clearHeader);
ellipsis = true;
(sizeof(class ListBoxCell) + field.dataType.typeSize - sizeof(void *)) : sizeof(class ListBoxCell);
ListBoxCell cell = (ListBoxCell)new0 byte[size];
row.cells.Add(cell);
- FillBytes(cell.data, 0, size - (uint)&((ListBoxCell)0).data);
+ FillBytes(cell.data, 0, size - (uint)(uintptr)&((ListBoxCell)0).data);
cell.isSet = false;
if(row.subRows.first)
if(row)
{
DataRow search;
- DataField field;
- int c;
row.index = 0;
rows.Insert(null, row);
// Find very last row
{
DataRow lastRow;
- for(lastRow = rows.last; lastRow && !lastRow.collapsed && lastRow.subRows.last; lastRow)
- lastRow = lastRow.subRows.last;
+ for(lastRow = rows.last; lastRow && !lastRow.collapsed && lastRow.subRows.last; lastRow = lastRow.subRows.last);
row.index = lastRow ? (lastRow.index + 1) : 0;
}
(sizeof(class ListBoxCell) + field.dataType.typeSize - sizeof(void *)) : sizeof(class ListBoxCell);
ListBoxCell cell = (ListBoxCell) new0 byte[size];
row.cells.Add(cell);
- FillBytes(cell.data, 0, size - (uint)&((ListBoxCell)0).data);
+ FillBytes(cell.data, 0, size - (uint)(uintptr)&((ListBoxCell)0).data);
cell.isSet = false;
}
}
(sizeof(class ListBoxCell) + field.dataType.typeSize - sizeof(void *)) : sizeof(class ListBoxCell);
ListBoxCell cell = (ListBoxCell) new0 byte[size];
row.cells.Add(cell);
- FillBytes(cell.data, 0, size - (uint)&((ListBoxCell)0).data);
+ FillBytes(cell.data, 0, size - (uint)(uintptr)&((ListBoxCell)0).data);
cell.isSet = false;
}
}
return null;
}
- DataRow AddStringf(char * format, ...)
+ DataRow AddStringf(const char * format, ...)
{
if(this)
{
return null;
}
- DataRow AddString(char * string)
+ DataRow AddString(const char * string)
{
if(this)
{
return null;
}
- DataRow FindString(char * searchedString)
+ DataRow FindString(const char * searchedString)
{
DataField field;
bool checkNextField = true;
- int len = searchedString ? strlen(searchedString) : 0;
for(field = fields.first; field; field = field.next)
{
void * data = row.GetData(field);
char tempString[1024] = "";
bool needClass = false;
- char * string = ((char *(*)(void *, void *, char *, void *, bool *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString])(field.dataType, data, tempString, null, &needClass);
+ const char * string = ((const char *(*)(void *, void *, char *, void *, bool *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString])(field.dataType, data, tempString, null, &needClass);
if(string && string[0])
checkNextField = false;
return null;
}
- DataRow FindSubString(char * subString)
+ DataRow FindSubString(const char * subString)
{
DataField field;
bool checkNextField = true;
void * data = row.GetData(field);
char tempString[1024] = "";
bool needClass = false;
- char * string = ((char *(*)(void *, void *, char *, void *, bool *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString])(field.dataType, data, tempString, null, &needClass);
+ const char * string = ((const char *(*)(void *, void *, char *, void *, bool *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString])(field.dataType, data, tempString, null, &needClass);
if(string && string[0])
checkNextField = false;
return null;
}
- DataRow FindSubStringi(char * subString)
+ DataRow FindSubStringi(const char * subString)
{
DataField field;
bool checkNextField = true;
int len = subString ? strlen(subString) : 0;
DataRow result = null;
- char * bestResult = null;
+ const char * bestResult = null;
int bestLen = 0;
if(len)
void * data = row.GetData(field);
char tempString[1024] = "";
bool needClass = false;
- char * string = ((char *(*)(void *, void *, char *, void *, bool *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString])(field.dataType, data, tempString, null, &needClass);
+ const char * string = ((const char *(*)(void *, void *, char *, void *, bool *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString])(field.dataType, data, tempString, null, &needClass);
if(string && string[0])
checkNextField = false;
return result;
}
- DataRow FindSubStringAfter(DataRow after, char * subString)
+ DataRow FindSubStringAfter(DataRow after, const char * subString)
{
DataField field;
bool checkNextField = true;
void * data = row.GetData(field);
char tempString[1024] = "";
bool needClass = false;
- char * string = ((char *(*)(void *, void *, char *, void *, bool *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString])(field.dataType, data, tempString, null, &needClass);
+ const char * string = ((const char *(*)(void *, void *, char *, void *, bool *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString])(field.dataType, data, tempString, null, &needClass);
if(string && string[0])
checkNextField = false;
ListBox()
{
DataField defaultField { };
- rows.offset = (uint)&((DataRow)0).prev;
- fields.offset = (uint)&((DataField)0).prev;
+ rows.offset = (uint)(uintptr)&((DataRow)0).prev;
+ fields.offset = (uint)(uintptr)&((DataField)0).prev;
style.fullRowSelect = true;
style.fillLastField = true;
style.expandOnAdd = true;
{
if(editData && editData.visible)
{
- Class dataType = currentField.dataType;
if(save)
editData.SaveData();
*/
PopupEditBox(currentField, repositionOnly);
}
- else
- printf("");
/*else
currentField = null;*/
int height = rowHeight - (style.alwaysEdit ? 1 : 0);
int x = 0;
int y = currentRow.index * rowHeight + (style.header ? rowHeight : 0);
- int width;
+ int width = 0;
DataField field;
if(style.collapse && !(style.treeBranch))
int height = rowHeight - (style.alwaysEdit ? 1 : 0);
int x = 0;
int y = currentRow.index * rowHeight + (style.header ? rowHeight : 0);
- int width;
+ int width = 0;
//void * data = currentRow.GetData(whichField);
DataField field;
DataRow row = null;
int indent = 0;
DataRow parent;
Bitmap icon = row.icon ? row.icon.bitmap : null;
- int collapseRowStart;
+ int collapseRowStart = 0;
bool lastWasHeader = row.header;
for(parent = row.parent; parent; parent = parent.parent)
Color colors[] = { formColor, azure, mistyRose, linen, floralWhite, lavender, lavenderBlush, lemonChiffon };
int level = 0;
DataRow p = row;
- while(p = p.parent) level++;
- background = colors[(level % (sizeof(colors)/sizeof(colors[0]))];
+ while((p = p.parent)) level++;
+ background = colors[level % (sizeof(colors)/sizeof(colors[0]))];
surface.SetBackground(background);
surface.Area(rowStart, y, clientSize.w, (y + rowHeight) - 1);
foreground = branchesColor;
surface.SetForeground(foreground);
surface.SetBackground(background);
- ((void (*)(void *, void *, void *, int, int, int, void *, uint, uint))(void *)class(String)._vTbl[__ecereVMethodID_class_OnDisplay])(class(String), "(none)", surface, x, y - 1 + (rowHeight - fontH)/2, width - EXTRA_SPACE/2, null, Alignment::left, dataDisplayFlags);
+ ((void (*)(void *, const void *, void *, int, int, int, void *, uint, uint))(void *)class(String)._vTbl[__ecereVMethodID_class_OnDisplay])(class(String), "(none)", surface, x, y - 1 + (rowHeight - fontH)/2, width - EXTRA_SPACE/2, null, Alignment::left, dataDisplayFlags);
}
else
{
- if(!opacity) surface.TextOpacity(false);
+ if(opacity < 1) surface.TextOpacity(false);
// Draw the rows
for(field = fields.first; field; field = field.next)
{
foreground = this.background;
}
+#ifdef _DEBUG
+ // surface.WriteTextf(x + 100, y, "ix: %d", row.index);
+#endif
+
x += width;// + EXTRA_SPACE;
if(row.header) break;
bool HeaderPushed(Button control, int x, int y, Modifiers mods)
{
- DataField field = (DataField)control.id;
+ DataField field = (DataField)(intptr)control.id;
// false: dont destroy edit box
HideEditBox(true, false, true);
if(style.resizable && ((!field && x < RESIZE_BORDER && fields.last) ||
}
else if(style.resizable)
{
- DataField field = (DataField)control.id;
+ DataField field = (DataField)(intptr)control.id;
if(field)
{
if(x < RESIZE_BORDER && field.prev)
{
if(style.header && !this.dropField && style.sortable)
{
- DataField field = (DataField)control.id;
+ DataField field = (DataField)(intptr)control.id;
if(sortField == field)
field.sortOrder *= -1;
else
{
if(style.resizable)
{
- DataField field = (DataField)control.id;
+ DataField field = (DataField)(intptr)control.id;
if(field)
{
if(x < RESIZE_BORDER && field.prev)
if(cell && cell.isSet && field.dataType)
{
static char tempString[4096];
- char * string;
+ const char * string;
int tw, th;
if(field.dataType.type == normalClass || field.dataType.type == noHeadClass)
- string = ((char *(*)(void *, void *, char *, void *, bool *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString])(field.dataType, cell.data[0], tempString, field.userData, null);
+ string = ((const char *(*)(void *, void *, char *, void *, bool *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString])(field.dataType, cell.data[0], tempString, field.userData, null);
else
- string = ((char *(*)(void *, void *, char *, void *, bool *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString])(field.dataType, cell.data, tempString, field.userData, null);
+ string = ((const char *(*)(void *, void *, char *, void *, bool *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString])(field.dataType, cell.data, tempString, field.userData, null);
/* GCC-4.4 Bug!
if(!string) string = "";
display.FontExtent(row.header ? boldFont : font, string, strlen(string), &tw, &th);
int rowIndex = firstRowShown ? firstRowShown.index : -1;
DataRow previousRow = currentRow;
DataRow newCurrentRow = null;
- DataField newCurrentField = null;
bool moveMultiple = false;
int numSelected = 0;
int rowStart = -scroll.x;
// activate it
if(editData && editData.visible && newCurrentRow)
{
- DataField field, whichField;
+ DataField field;
int sx = -scroll.x;
int indent = 0;
if(style.collapse && !(style.treeBranch))
sx += 15;
- whichField = currentField;
-
{
DataRow parent;
for(parent = newCurrentRow.parent; parent; parent = parent.parent)
// Switch row first: move before
if(row == switchRow)
{
- if(NotifyMove(master, this, switchRow.prev, mods))
- dragRow.Move(switchRow.prev);
+ DataRow actualMoveRow;
+
+ if(!switchRow.prev && switchRow.parent == dragRow.parent)
+ actualMoveRow = null;
+ else
+ {
+ actualMoveRow = switchRow.prev ? switchRow.prev : switchRow;
+ while(actualMoveRow && actualMoveRow.parent != dragRow.parent && actualMoveRow.parent)
+ actualMoveRow = actualMoveRow.parent;
+ }
+
+ if(!actualMoveRow || (actualMoveRow && actualMoveRow.parent == dragRow.parent))
+ if(NotifyMove(master, this, actualMoveRow, mods))
+ {
+ dragRow.Move(actualMoveRow);
+ NotifyMoved(master, this, actualMoveRow, mods);
+ }
}
// Dragged row first: move after
else
{
- if(NotifyMove(master, this, switchRow, mods))
- dragRow.Move(switchRow);
+ DataRow actualMoveRow = switchRow;
+ DataRow nextRow = switchRow.GetNextRow();
+
+ while(nextRow && nextRow.parent != dragRow.parent)
+ nextRow = nextRow.parent ? nextRow.parent.next : null;
+ if(nextRow)
+ actualMoveRow = nextRow.prev;
+
+ if(!nextRow)
+ actualMoveRow = dragRow.parent ? dragRow.parent.subRows.last : rows.last;
+
+ if(!actualMoveRow || (actualMoveRow != dragRow && actualMoveRow.parent == dragRow.parent))
+ if(NotifyMove(master, this, actualMoveRow, mods))
+ {
+ dragRow.Move(actualMoveRow);
+ NotifyMoved(master, this, actualMoveRow, mods);
+ }
}
}
}
void * data = row.GetData(field);
char tempString[1024] = "";
bool needClass = false;
- char * string = data ? ((char *(*)(void *, void *, char *, void *, bool *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString])(field.dataType, data, tempString, null, &needClass) : null;
+ const char * string = data ? ((const char *(*)(void *, void *, char *, void *, bool *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString])(field.dataType, data, tempString, null, &needClass) : null;
if(string && string[0])
checkNextField = false;
if(style.multiSelect)
{
DataRow selRow;
- bool foundRow = false;
- //this.clickedRowIndex = 0;
clickedRow = row;
for(selRow = rows.first; selRow; selRow = selRow.GetNextRow())
- {
- if(selRow == row) foundRow = true;
selRow.selectedFlag = unselected;
- //if(!foundRow) this.clickedRowIndex++;
- }
row.selectedFlag = selected;
}
SetCurrentRow(row, true);
int rowCount;
int rowHeight;
int fontH;
- double typingTimeOut;
+ public double typingTimeOut;
char * typedString;
int mouseX, mouseY;
Ecere Software / sdk / blobdiff