}
}
+static define sheetSelectionColor = Color { 170, 220, 255 };
+static define sheetSelectionText = black;
+
class Sheet : Window
{
text = $"Sheet";
categorized.disabled = true;
methods.Activate();
-
+
// ((IDEWorkSpace)master).SheetSelected(Methods);
return true;
}
hasVertScroll = true, alwaysEdit = true, collapseControl = true, resizable = true;
background = viewsBackground;
foreground = viewsText;
+ selectionText = sheetSelectionText;
+ selectionColor = sheetSelectionColor;
bool NotifySelect(ListBox control, DataRow row, Modifiers keyFlags)
{
{
CodeObject object = control.GetData(methodName);
if(object)
- codeEditor.AddMethod(object.method);
+ codeEditor.AddMethod(object.method);
return false;
}
this, bevelOver = true, checked = true, inactive = true, position = { 0, 25 }, size = { 24, 24 };
bitmap = { "<:ecere>elements/orderCategorized.png" };
// isRadio = true;
-
+
bool NotifyClicked(Button button, int x, int y, Modifiers mods)
{
if(!categorized.checked)
dropBox.Clear();
dropField.userData = codeEditor;
methodName.userData = codeEditor;
-
+
if(codeEditor)
codeEditor.EnumerateObjects(this);
}
else if(key == escape)
{
Window activeClient = ide.activeClient;
- if(activeClient)
+ if(activeClient)
activeClient.Activate();
- else
+ else
ide.RepositionWindows(true);
}
return true;
{
DataRow row = dropBox.currentRow;
ObjectInfo selected = row ? (ObjectInfo)row.tag : null;
-
+
//int scroll = 0;
bool categorized = this.categorized.checked;
bool currentRow = false;
char * propName;
while(propRow && propRow.parent && !propRow.parent.isHeader)
propRow = row.parent;
-
+
propName = propRow.GetData(propertyName);
strcpy(this.selectedProp, propName);
selectedScroll = properties.scroll.y;
if(propIt.isProperty)
{
Property prop = eClass_FindProperty(selected.instance._class, propIt.name, GetPrivateModule());
-
+
if(prop && prop.Set && prop.Get && prop.compiled && (!prop.category || strcmpi(prop.category, $"Deprecated")))
{
bool disabled = Code_IsPropertyDisabled(selected, prop.name);
if(!strcmp(_class.name, "DesignerBase"))
disabled = true;
- bold = !disabled && Code_IsPropertyModified(test, selected, prop);
+ bold = !disabled && Code_IsPropertyModified(test, selected, prop);
if(dataType)
{
DataRow row;
PropertyInfo info { prop, disabled, bold ? codeEditor.boldFont : codeEditor.normalFont };
- char * name = prop.category ? prop.category : $"Misc";
+ const char * name = prop.category ? prop.category : $"Misc";
Category category = categories.FindName(name, false);
// Hide properties like this for now..
- if(name && !strcmp(name, "Private"))
+ if(name && !strcmp(name, "Private"))
{
delete info;
continue;
if(!dataType.noExpansion && (dataType.type == structClass || dataType.type == normalClass || dataType.type == noHeadClass || dataType.type == bitClass))
{
DataMember member;
-
+
if(clear)
row.collapsed = true;
}
else
subRow = row.FindRow((int64)subProp);
-
+
subRow.SetData(propertyName, subProp.name);
subRow.SetData(propertyValue, info);
}
if(!properties.currentRow)
{
bool found = false;
-
+
for(_class = selected.instance._class; _class; _class = _class.base)
{
Property prop;
if(_class.defaultProperty && !strcmp(prop.name, _class.defaultProperty))
{
DataRow row;
- char * name = prop.category ? prop.category : $"Misc";
+ const char * name = prop.category ? prop.category : $"Misc";
Category category = categories.FindName(name, false);
row = category ? (categorized ? category.row.FindRow((int64)prop) : properties.FindRow((int64)prop)) : null;
properties.currentRow = row;
found = true;
- break;
+ break;
}
}
}
}
}
- void AddObject(ObjectInfo object, char * name, CodeObjectType type, bool select)
+ void AddObject(ObjectInfo object, const char * name, CodeObjectType type, bool select)
{
DataRow after = null;
DataRow row;
}
row = (DataRow)dropBox.AddRowAfter(after);
-
+
row.tag = (int64)object;
- codeObject =
+ codeObject =
{
object = object;
name = name;
codeObject.bitmap = { bitmap };
AddResource(codeObject.bitmap);
}
-
+
row.SetData(null, codeObject);
if(select)
if(row)
{
CodeObject codeObject = row.GetData(null);
-
+
if(codeObject.bitmap)
RemoveResource(codeObject.bitmap);
dropBox.DeleteRow(row);
}
}
- void RenameObject(ObjectInfo object, char * name)
+ void RenameObject(ObjectInfo object, const char * name)
{
DataRow row = dropBox.FindRow((int64)object);
CodeObject codeObject = row.GetData(null);
Property prop = propertyPtr ? propertyPtr.prop : null;
Instance object = this.object;
if(prop)
- {
+ {
Class dataType = prop.dataTypeClass;
if(!dataType)
dataType = prop.dataTypeClass = eSystem_FindClass(codeEditor.privateModule, prop.dataTypeString);
else
{
SetPropValue(prop, object, (uint32)setValue);
- }
+ }
Code_FixProperty(propertyPtr.prop, object);
properties.Update(null);
ClassFunction function = (ClassFunction)selection.id;
CodeObject object = methods.GetData(methodName);
if(object)
- codeEditor.AddMethod(object.method);
+ codeEditor.AddMethod(object.method);
return true;
}
{
DataRow row = (DataRow)button.id;
CodeObject object = row.GetData(methodName);
- codeEditor.AddMethod(object.method);
+ codeEditor.AddMethod(object.method);
return true;
}
void CreateButtons(CodeObject codeObject, int y, int h, DataRow row)
{
BitmapResource bitmap;
-
+
if(codeObject.overriden)
{
if(codeObject.overriden == 1)
sprintf(title, $"Delete %s", codeObject.name);
if(MessageBox
{
- master = parent, type = okCancel, text = title,
+ master = parent, type = okCancel, text = title,
contents = $"Method still contains code. Are you sure you want to delete it?"
}.Modal() == ok)
confirmation = false;
if(codeObject.overriden == 2 || !codeObject.function.attached.count)
{
- codeObject.detachBtn = Button
+ codeObject.detachBtn = Button
{
methods,
master = methods.master,
PopupMenu popupMenu;
Menu menu { };
-
+
for(compatible = object.compatible.first; compatible; compatible = compatible.next)
{
ClassFunction function = compatible.data;
attachMethod = object.method;
popupMenu = PopupMenu
- {
- master = this, menu = menu,
+ {
+ master = this, menu = menu,
position =
{
button.absPosition.x - app.desktop.position.x,
int selectedScroll;
}
-static int String_OnCompare(char ** string1, char ** string2)
+static int String_OnCompare(const char ** string1, const char ** string2)
{
int result = 0;
if(*string1 && *string2)
{
DataMember member;
for(member = _class.membersAndProperties.first; member; member = member.next)
- {
+ {
Class memberType = member.dataTypeClass;
if(!memberType)
memberType = member.dataTypeClass = eSystem_FindClass(((Designer)GetActiveDesigner()).codeEditor.privateModule, member.dataTypeString);
if(subProp.Get && subProp.Set)
CopyProperty(subProp, propObject, current);
}
- else
+ else if(member.id > -1)
{
if(memberType)
// TOCHECK: I have serious doubts this works in many cases.
((void (*)(void *, void *, void *))(void *)memberType._vTbl[__ecereVMethodID_class_OnCopy])(memberType, (byte *)propObject + member.offset, (byte *)current + member.offset);
- else if(member.memberOffset)
+ else
memcpy((byte *)propObject + member.offset, (byte *)current + member.offset, member.memberOffset);
}
}
Property prop;
bool disabled;
FontResource font;
- char * categoryName;
+ const char * categoryName;
DataMember subMember;
Property subProperty;
uint extraOffset;
surface.TextFont(font.font);
if(disabled)
- {
+ {
surface.SetBackground(Color { 170, 170, 170 });
surface.Area(0,0, x+width-1, y+100);
}
Module module = ((Designer)GetActiveDesigner()).codeEditor.privateModule;
if(!dataType)
dataType = prop.dataTypeClass = eSystem_FindClass(module, prop.dataTypeString);
-
+
if(dataType && prop.Get)
{
void * dataPtr, * data = null, * subData = null;
DataValue valueData, valueSubData;
uint64 bitValue;
-
+
// Get main prop
if(dataType.type == structClass)
{
else
dataPtr = &valueData;
}
-
+
// Get sub prop
if(this.subMember)
{
{
Window editData = null;
Property prop = this.prop;
-
+
dataBox.SetData = Sheet::EditSetData;
if(prop && prop.dataTypeString && !this.disabled)
{
void * dataPtr, * data = null, * subData = null;
DataValue valueData, valueSubData;
uint64 bitValue;
-
+ bool isEditBoxMultiLineContents = false;
+
// Get main prop
if(dataType.type == structClass)
{
}
else
{
- GetProperty(prop, object, &valueData);
+ bool freeDataForm = false, freeDataTest = false;
+ // Because contents property is broken for mutiline EditBox at the moment
+ if(!strcmp(prop.name, "contents") && !strcmp(prop._class.name, "EditBox") && ((EditBox)object).multiLine)
+ {
+ isEditBoxMultiLineContents = true;
+ dataType = eSystem_FindClass(((Designer)GetActiveDesigner()).codeEditor.privateModule, "MultiLineString");
+ valueData.p = ((EditBox)object).multiLineContents;
+ dataBox.size.h = 3*(h-2);
+ h = dataBox.clientSize.h;
+ }
+ else
+ GetProperty(prop, object, &valueData);
+
if(dataType.type == normalClass)
dataPtr = valueData.p;
else
dataPtr = &valueData;
}
-
+
// Get sub prop
if(this.subMember)
{
delete data;
delete subData;
+ if(isEditBoxMultiLineContents)
+ delete valueData.p;
+
editData.font = { font.faceName, font.size, font.bold };
+ if(eClass_IsDerived(editData._class, class(DropBox)))
+ {
+ DropBox db = (DropBox)editData;
+ db.selectionColor = sheetSelectionColor;
+ db.selectionText = sheetSelectionText;
+ }
+ else if(eClass_IsDerived(editData._class, class(EditBox)))
+ {
+ EditBox eb = (EditBox)editData;
+ eb.selectionColor = sheetSelectionColor;
+ eb.selectionText = sheetSelectionText;
+ }
}
}
return editData;
int OnCompare(PropertyInfo data2)
{
- char * category1 = prop ? prop.category : categoryName;
- char * category2 = data2.prop ? data2.prop.category : data2.categoryName;
+ const char * category1 = prop ? prop.category : categoryName;
+ const char * category2 = data2.prop ? data2.prop.category : data2.categoryName;
int result;
if(!category1) category1 = $"Misc";
if(!category2) category2 = $"Misc";
-
+
if(!prop)
{
- // result = String::OnCompare((String)category1, (String)category2);
result = String_OnCompare(&category1, &category2);
}
else
else
// result = ((String)prop.name).OnCompare(data2.prop.name);
// result = String::OnCompare((String)prop.name, (String)data2.prop.name);
- result = String_OnCompare(&prop.name, &data2.prop.name);
+ result = String_OnCompare((const char **)&prop.name, (const char **)&data2.prop.name);
}
return result;
}
if(!mainDataType)
mainDataType = prop.dataTypeClass = eSystem_FindClass(((Designer)GetActiveDesigner()).codeEditor.privateModule, prop.dataTypeString);
dataType = mainDataType;
-
+
+ // Because contents property is broken for mutiline EditBox at the moment
+ if(!strcmp(prop.name, "contents") && !strcmp(prop._class.name, "EditBox") && ((EditBox)object).multiLine)
+ dataType = eSystem_FindClass(((Designer)GetActiveDesigner()).codeEditor.privateModule, "MultiLineString");
+
// Prepare main prop
if(dataType.type == structClass)
{
else if(dataType.type == normalClass || dataType.type == noHeadClass)
{
dataPtr = &valueData;
-
+
if(this.subMember || this.subProperty)
{
Class _class;
}
else
{
-
+
if(this.subMember || this.subProperty)
GetProperty(prop, object, &valueData);
-
+
dataPtr = &valueData;
propObject = &valueData;
}
-
+
// Prepare sub prop
if(this.subMember)
{
{
Property subProperty = this.subProperty;
Class subDataType = subProperty.dataTypeClass;
-
+
if(!subDataType)
- subDataType = subProperty.dataTypeClass =
+ subDataType = subProperty.dataTypeClass =
eSystem_FindClass(((Designer)GetActiveDesigner()).codeEditor.privateModule, subProperty.dataTypeString);
if(!subProperty.Get) subDataType = null;
if(subDataType)
{
if(dataType.type == structClass)
((void (*)(void *, void *))(void *)this.subProperty.Set)(propObject, subData);
- else if(dataType.type == unitClass || dataType.type == enumClass || dataType.type == bitClass)
+ else if(dataType.type == unitClass || dataType.type == enumClass || dataType.type == bitClass || dataType.type == systemClass)
{
if(!strcmp(dataType.dataTypeString, "float"))
((void(*)(void *,float))(void *)this.subProperty.Set)(propObject, valueSubData.f);
((void(*)(void *,byte))(void *)this.subProperty.Set)(propObject, valueSubData.uc);
else if(!strcmp(dataType.dataTypeString, "uint16"))
((void(*)(void *,uint16))(void *)this.subProperty.Set)(propObject, valueSubData.us);
- else
+ else
((void (*)(void *, uint))(void *)this.subProperty.Set)(propObject, valueSubData.ui);
}
else
- ((void (*)(void *, uint))(void *)this.subProperty.Set)(propObject, valueSubData.ui);
+ ((void (*)(void *, void *))(void *)this.subProperty.Set)(propObject, valueSubData.p);
}
if(mainDataType.type == structClass)
((void (*)(void *, void *))(void *)prop.Set)(object, data);
- else if(mainDataType.type == unitClass || mainDataType.type == enumClass || mainDataType.type == bitClass)
+ else if(mainDataType.type == unitClass || mainDataType.type == enumClass || mainDataType.type == bitClass || mainDataType.type == systemClass)
{
if(!strcmp(mainDataType.dataTypeString, "float"))
((void(*)(void *,float))(void *)prop.Set)(object, valueData.f);
((void (*)(void *, uint))(void *)prop.Set)(object, valueData.ui);
}
else
- ((void (*)(void *, uint))(void *)prop.Set)(object, valueData.ui);
+ ((void (*)(void *, void *))(void *)prop.Set)(object, valueData.p);
result = true;
}
class Category : struct
{
Category prev, next;
- char * name;
+ const char * name;
DataRow row;
bool collapsed;
};
Ecere Software / sdk / blobdiff