From 4ad239597782db2f023ee8d03b5489bd0b3923e7 Mon Sep 17 00:00:00 2001
From: nakst <>
Date: Thu, 7 Oct 2021 09:51:52 +0100
Subject: [PATCH] bugfixes; cleanup theme

---
 desktop/styles.header  |  16 ++++++++--------
 ports/bochs/essence.cc |  11 +++++++----
 res/Theme Source.dat   | Bin 583368 -> 558600 bytes
 res/Theme.dat          | Bin 29880 -> 29936 bytes
 shared/common.cpp      |   6 ++++--
 util/designer2.cpp     |  35 ++++++++++++++++++++++++++++++++++-
 6 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/desktop/styles.header b/desktop/styles.header
index 0622847..a639fb3 100644
--- a/desktop/styles.header
+++ b/desktop/styles.header
@@ -1,3 +1,4 @@
+define ES_STYLE_SEPARATOR_HORIZONTAL (ES_STYLE_CAST(1373))
 private define ES_STYLE__TEST_STYLE (ES_STYLE_CAST(1385))
 private define ES_STYLE_ACCESS_KEY_HINT (ES_STYLE_CAST(1221))
 private define ES_STYLE_ANNOUNCEMENT (ES_STYLE_CAST(1511))
@@ -8,7 +9,13 @@ define ES_STYLE_BUTTON_GROUP_CONTAINER (ES_STYLE_CAST(1229))
 define ES_STYLE_BUTTON_GROUP_ITEM (ES_STYLE_CAST(1231))
 define ES_STYLE_BUTTON_GROUP_SEPARATOR (ES_STYLE_CAST(1233))
 private define ES_STYLE_CANVAS_SHADOW (ES_STYLE_CAST(1451))
+private define ES_STYLE_COLOR_HEX_TEXTBOX (ES_STYLE_CAST(1245))
+private define ES_STYLE_TASK_BAR_BAR (ES_STYLE_CAST(1379))
+private define ES_STYLE_SLIDER_TRACK (ES_STYLE_CAST(1601))
 private define ES_STYLE_CHECKBOX_NORMAL (ES_STYLE_CAST(1559))
+private define ES_STYLE_SPLIT_BAR_VERTICAL (ES_STYLE_CAST(1377))
+private define ES_STYLE_WINDOW_TAB_CLOSE_BUTTON (ES_STYLE_CAST(1469))
+private define ES_STYLE_SPLIT_BAR_HORIZONTAL (ES_STYLE_CAST(1375))
 private define ES_STYLE_CHECKBOX_RADIOBOX (ES_STYLE_CAST(1567))
 define ES_STYLE_CLEAR_BACKGROUND (ES_STYLE_CAST(1597))
 private define ES_STYLE_COLOR_CHOSEN_POINT (ES_STYLE_CAST(1241))
@@ -86,6 +93,7 @@ define ES_STYLE_PANEL_WINDOW_BACKGROUND (ES_STYLE_CAST(1341))
 define ES_STYLE_TEXTBOX_BORDERED_MULTILINE (ES_STYLE_CAST(1399))
 define ES_STYLE_PANEL_WINDOW_DIVIDER (ES_STYLE_CAST(1343))
 define ES_STYLE_PANEL_WINDOW_WITH_STATUS_BAR_CONTENT (ES_STYLE_CAST(1483))
+private define ES_STYLE_SLIDER_POINT (ES_STYLE_CAST(1607))
 define ES_STYLE_PUSH_BUTTON_DANGEROUS (ES_STYLE_CAST(1345))
 private define ES_STYLE_TEXTBOX_INLINE (ES_STYLE_CAST(1477))
 private define ES_STYLE_PUSH_BUTTON_NORMAL (ES_STYLE_CAST(1347))
@@ -112,11 +120,3 @@ private define ES_STYLE_SCROLLBAR_BAR_VERTICAL (ES_STYLE_CAST(1365))
 private define ES_STYLE_SCROLLBAR_THUMB_HORIZONTAL (ES_STYLE_CAST(1367))
 private define ES_STYLE_SCROLLBAR_THUMB_VERTICAL (ES_STYLE_CAST(1369))
 private define ES_STYLE_SCROLLBAR_PAD (ES_STYLE_CAST(1371))
-define ES_STYLE_SEPARATOR_HORIZONTAL (ES_STYLE_CAST(1373))
-private define ES_STYLE_SLIDER_POINT (ES_STYLE_CAST(1607))
-private define ES_STYLE_SLIDER_TRACK (ES_STYLE_CAST(1601))
-private define ES_STYLE_SPLIT_BAR_HORIZONTAL (ES_STYLE_CAST(1375))
-private define ES_STYLE_WINDOW_TAB_CLOSE_BUTTON (ES_STYLE_CAST(1469))
-private define ES_STYLE_SPLIT_BAR_VERTICAL (ES_STYLE_CAST(1377))
-private define ES_STYLE_TASK_BAR_BAR (ES_STYLE_CAST(1379))
-private define ES_STYLE_COLOR_HEX_TEXTBOX (ES_STYLE_CAST(1245))
diff --git a/ports/bochs/essence.cc b/ports/bochs/essence.cc
index a364c3c..e77102e 100644
--- a/ports/bochs/essence.cc
+++ b/ports/bochs/essence.cc
@@ -196,10 +196,13 @@ int CanvasCallback(EsElement *element, EsMessage *message) {
 	// TODO Is it safe to pass input to Bochs on this thread?
 
 	if (message->type == ES_MSG_PAINT) {
-		int ox = message->painter->width / 2 - instance->vmemWidth / 2;
-		int oy = message->painter->height / 2 - instance->vmemHeight / 2;
-		EsRectangle bounds = { ox, ox + instance->vmemWidth, oy, oy + instance->vmemHeight };
-		EsDrawBitmap(message->painter, bounds, instance->vmem, instance->vmemWidth * 4, 0xFFFF);
+		EsRectangle bounds = EsPainterBoundsInset(message->painter);
+		EsRectangle imageBounds = EsRectangleCenter(bounds, ES_RECT_2S(instance->vmemWidth, instance->vmemHeight));
+		EsDrawBitmap(message->painter, imageBounds, instance->vmem, instance->vmemWidth * 4, ES_DRAW_BITMAP_OPAQUE);
+		EsDrawBlock(message->painter, ES_RECT_4(bounds.l, imageBounds.l, bounds.t, bounds.b), 0xFF000000);
+		EsDrawBlock(message->painter, ES_RECT_4(imageBounds.r, bounds.r, bounds.t, bounds.b), 0xFF000000);
+		EsDrawBlock(message->painter, ES_RECT_4(imageBounds.l, imageBounds.r, bounds.t, imageBounds.t), 0xFF000000);
+		EsDrawBlock(message->painter, ES_RECT_4(imageBounds.l, imageBounds.r, imageBounds.b, bounds.b), 0xFF000000);
 		repaintQueued = false;
 	} else if (message->type == ES_MSG_KEY_DOWN) {
 		if (message->keyboard.scancode == ES_SCANCODE_RIGHT_CTRL) {
diff --git a/res/Theme Source.dat b/res/Theme Source.dat
index 325cad1e27a0e975cdb64f7352fe3194a9210ea4..927e7506590e8dd1680cd40a749c4cfc364c9ab8 100644
GIT binary patch
delta 7082
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
MkgGUZKq2$L0W&Wp4*&oF

delta 8806
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

diff --git a/res/Theme.dat b/res/Theme.dat
index d2cdbbecf301eba128160c0a6cb4b7fbdebae465..e6cc8c13bb6fa70448009a60539965af44bdd399 100644
GIT binary patch
delta 6183
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
M8L0xrL1YK~A68$Kg#Z8m

delta 6241
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

diff --git a/shared/common.cpp b/shared/common.cpp
index 2bfb772..acc119e 100644
--- a/shared/common.cpp
+++ b/shared/common.cpp
@@ -365,15 +365,17 @@ void EsDrawBitmap(EsPainter *painter, EsRectangle region, uint32_t *sourceBits,
 				j--;
 			} 
 		} else if (mode == ES_DRAW_BITMAP_OPAQUE) {
+			__m128i fillAlpha = _mm_set1_epi32(0xFF000000);
+
 			while (j >= 4) {
-				_mm_storeu_si128((__m128i *) destination, _mm_loadu_si128((__m128i *) source));
+				_mm_storeu_si128((__m128i *) destination, _mm_or_si128(fillAlpha, _mm_loadu_si128((__m128i *) source)));
 				destination += 4;
 				source += 4;
 				j -= 4;
 			} 
 
 			while (j > 0) {
-				*destination = *source;
+				*destination = 0xFF000000 | *source;
 				destination++;
 				source++;
 				j--;
diff --git a/util/designer2.cpp b/util/designer2.cpp
index dfaf357..fb6bd76 100644
--- a/util/designer2.cpp
+++ b/util/designer2.cpp
@@ -20,6 +20,9 @@
 // 	Prototyping display: previewing state transitions.
 
 // TODO Additional features:
+// 	Method to iterate through all the objects that link to selected object.
+// 	Sorted list in ObjectAddInstanceCommand.
+// 	Hide arrows to colors.
 //	Having to link to the end of a conditional object chain is a bit strange.
 // 	Output styles.header in order of header ID.
 // 	Cleaning up unused objects.
@@ -342,6 +345,7 @@ struct Step {
 
 struct ExportOffset {
 	uint64_t objectID;
+	uint64_t styleObjectID;
 	uintptr_t offset;
 	char cPropertyName[PROPERTY_NAME_SIZE];
 	uint8_t overrideType;
@@ -414,6 +418,16 @@ ExportOffset *ExportOffsetFindObject(uint64_t id) {
 	return nullptr;
 }
 
+ExportOffset *ExportOffsetFindObjectForStyle(uint64_t id, uint64_t style) {
+	for (uintptr_t i = 0; i < exportOffsets.Length(); i++) {
+		if (exportOffsets[i].objectID == id && exportOffsets[i].styleObjectID == style) {
+			return &exportOffsets[i];
+		}
+	}
+
+	return nullptr;
+}
+
 ExportOffset *ExportOffsetFindProperty(uint64_t objectID, const char *cPropertyName) {
 	for (uintptr_t i = 0; i < exportOffsets.Length(); i++) {
 		if (exportOffsets[i].objectID == objectID
@@ -1433,6 +1447,18 @@ void InspectorPopulate() {
 	UIParentPush(inspector);
 
 	Object *object = ObjectFind(selectedObjectID);
+	size_t referenceCount = 0;
+
+	if (object) {
+		for (uintptr_t i = 0; i < objects.Length(); i++) {
+			for (uintptr_t j = 0; j < objects[i].properties.Length(); j++) {
+				if (objects[i].properties[j].type == PROP_OBJECT 
+						&& objects[i].properties[j].object == object->id) {
+					referenceCount++;
+				}
+			}
+		}
+	}
 
 	if (object && object->type != OBJ_INSTANCE) {
 		UIPanelCreate(0, UI_ELEMENT_PARENT_PUSH | UI_PANEL_BORDER | UI_PANEL_MEDIUM_SPACING | UI_PANEL_EXPAND);
@@ -1444,6 +1470,8 @@ void InspectorPopulate() {
 			UIButtonCreate(0, UI_BUTTON_SMALL, "Auto", -1)->invoke = InspectorAutoNameObject;
 			UIButtonCreate(0, UI_BUTTON_SMALL, "Rename", -1)->invoke = InspectorRenameObject;
 			UIParentPop();
+			snprintf(buffer, sizeof(buffer), "%ld references", referenceCount);
+			UILabelCreate(0, 0, buffer, -1);
 
 			bool inheritWithAnimation = object->type == OBJ_VAR_TEXT_STYLE
 				|| object->type == OBJ_LAYER_BOX || object->type == OBJ_LAYER_TEXT || object->type == OBJ_LAYER_PATH
@@ -3122,6 +3150,8 @@ void Export() {
 			continue;
 		}
 		
+		uint64_t styleObjectID = object->id;
+
 		Object *metrics = PropertyFindOrInheritReadObject(object, "metrics");
 		Object *textStyle = PropertyFindOrInheritReadObject(object, "textStyle");
 		Object *appearance = PropertyFindOrInheritReadObject(object, "appearance");
@@ -3208,6 +3238,7 @@ void Export() {
 				if (!layerObject) continue;
 
 				ExportOffset exportOffset = {};
+				exportOffset.styleObjectID = styleObjectID;
 				exportOffset.objectID = layerObject->id;
 				exportOffset.offset = ftell(output);
 				exportOffsets.Add(exportOffset);
@@ -3271,6 +3302,8 @@ void Export() {
 			continue;
 		}
 
+		uint64_t styleObjectID = object->id;
+
 		ExportOffset exportOffset = {};
 		exportOffset.objectID = object->id;
 		exportOffset.offset = ftell(output);
@@ -3292,7 +3325,7 @@ void Export() {
 				Property *layerProperty = PropertyFind(appearance, cPropertyName, PROP_OBJECT);
 				Object *layerObject = ObjectFind(layerProperty ? layerProperty->object : 0);
 				if (!layerObject) continue;
-				uint32_t exportOffset = ExportOffsetFindObject(layerObject->id)->offset;
+				uint32_t exportOffset = ExportOffsetFindObjectForStyle(layerObject->id, styleObjectID)->offset;
 				fwrite(&exportOffset, 1, sizeof(exportOffset), output);
 			}
 		}