Fix layout issue with buttons in title bar

Author: SanderMertens

deps/flecs.c

@@ -28148,6 +28148,7 @@ void flecs_rest_shrink_memory(
     ecs_world_t *world,
     void *ctx)
 {
+    (void)ctx;
     ecs_shrink(world);
 }
 
@@ -28158,6 +28159,8 @@ bool flecs_rest_action(
     ecs_http_reply_t *reply,
     const char *path)
 {
+    (void)path;
+
     char *action = &req->path[7];
     ecs_dbg_2("rest: run action '%s'", action);
 
@@ -49241,14 +49244,15 @@ int flecs_json_serialize_table_components(
 }
 
 static
-bool flecs_json_serialize_table_inherited_type(
+int flecs_json_serialize_table_inherited_type(
     const ecs_world_t *world,
     ecs_table_t *table,
     ecs_strbuf_t *buf,
-    const ecs_iter_to_json_desc_t *desc)
+    const ecs_iter_to_json_desc_t *desc,
+    bool *has_inherited)
 {
     if (!(table->flags & EcsTableHasIsA)) {
-        return false;
+        return 0;
     }
 
     const ecs_table_record_t *tr = flecs_component_get_table(
@@ -49264,7 +49268,11 @@ bool flecs_json_serialize_table_inherited_type(
         }
 
         ecs_table_t *base_table = base_record->table;
-        flecs_json_serialize_table_inherited_type(world, base_table, buf, desc);
+        if (flecs_json_serialize_table_inherited_type(
+            world, base_table, buf, desc, has_inherited)) 
+        {
+            return -1;      
+        }
 
         char *base_name = ecs_get_path(world, base);
         flecs_json_member(buf, base_name);
@@ -49279,9 +49287,12 @@ bool flecs_json_serialize_table_inherited_type(
             buf, desc);
 
         int32_t component_count = 0;
-        flecs_json_serialize_table_components(
+        if (flecs_json_serialize_table_components(
             world, base_table, table, buf, NULL, desc, 
-                ECS_RECORD_TO_ROW(base_record->row), &component_count);
+                ECS_RECORD_TO_ROW(base_record->row), &component_count)) 
+        {
+            return -1;
+        }
 
         if (desc->serialize_type_info) {
             flecs_json_serialize_table_type_info(
@@ -49291,56 +49302,69 @@ bool flecs_json_serialize_table_inherited_type(
         flecs_json_object_pop(buf);
     }
 
-    return true;
+    *has_inherited = true;
+    return 0;
 }
 
 static
-bool flecs_json_serialize_table_inherited(
+int flecs_json_serialize_table_inherited(
     const ecs_world_t *world,
     ecs_table_t *table,
     ecs_strbuf_t *buf,
-    const ecs_iter_to_json_desc_t *desc)
+    const ecs_iter_to_json_desc_t *desc,
+    bool *has_inherited)
 {
     if (!(table->flags & EcsTableHasIsA)) {
-        return false;
+        return 0;
     }
 
     flecs_json_memberl(buf, "inherited");
     flecs_json_object_push(buf);
-    flecs_json_serialize_table_inherited_type(world, table, buf, desc);
+    if (flecs_json_serialize_table_inherited_type(
+        world, table, buf, desc, has_inherited)) 
+    {
+        return -1;
+    }
     flecs_json_object_pop(buf);
-    return true;
+    return 0;
 }
 
 static
-bool flecs_json_serialize_table_tags_pairs_vars(
+int flecs_json_serialize_table_tags_pairs_vars(
     const ecs_world_t *world,
     const ecs_iter_t *it,
     ecs_table_t *table,
     int32_t row,
     ecs_strbuf_t *buf,
-    const ecs_iter_to_json_desc_t *desc)
+    const ecs_iter_to_json_desc_t *desc,
+    bool *result_out)
 {
-    bool result = false;
+    *result_out = false;
     ecs_strbuf_list_push(buf, "", ",");
-    result |= flecs_json_serialize_table_tags(world, table, NULL, buf, desc);
-    result |= flecs_json_serialize_table_pairs(world, table, NULL, row, buf, desc);
-    result |= flecs_json_serialize_vars(world, it, buf, desc);
+    *result_out |= flecs_json_serialize_table_tags(world, table, NULL, buf, desc);
+    *result_out |= flecs_json_serialize_table_pairs(world, table, NULL, row, buf, desc);
+    *result_out |= flecs_json_serialize_vars(world, it, buf, desc);
+
     if (desc->serialize_inherited) {
-        result |= flecs_json_serialize_table_inherited(world, table, buf, desc);
+        if (flecs_json_serialize_table_inherited(
+            world, table, buf, desc, result_out)) 
+        {
+            return -1;
+        }
     }
 
     if (desc->serialize_type_info) {
         /* If we're serializing tables and are requesting type info, it must be
          * added to each result. */
-        result |= flecs_json_serialize_table_type_info(world, table, buf, desc);
+         *result_out |= flecs_json_serialize_table_type_info(world, table, buf, desc);
     }
 
     ecs_strbuf_list_pop(buf, "");
-    if (!result) {
+    if (!*result_out) {
         ecs_strbuf_reset(buf);
     }
-    return result;
+
+    return 0;
 }
 
 int flecs_json_serialize_iter_result_table(
@@ -49363,9 +49387,14 @@ int flecs_json_serialize_iter_result_table(
     int32_t tags_pairs_vars_len = 0;
     char *tags_pairs_vars = NULL;
 
+    bool has_tags_pairs_vars = false;
     if (flecs_json_serialize_table_tags_pairs_vars(
-        world, it, table, 0, &tags_pairs_vars_buf, desc)) 
+        world, it, table, 0, &tags_pairs_vars_buf, desc, &has_tags_pairs_vars)) 
     {
+        return -1;
+    }
+
+    if (has_tags_pairs_vars) {
         tags_pairs_vars_len = ecs_strbuf_written(&tags_pairs_vars_buf);
         tags_pairs_vars = ecs_strbuf_get(&tags_pairs_vars_buf);
     }
@@ -55863,7 +55892,7 @@ int flecs_meta_serialize_type(
     const EcsType *ptr = ecs_get(world, type, EcsType);
     if (!ptr) {
         char *path = ecs_get_path(world, type);
-        ecs_err("missing EcsType for type %s'", path);
+        ecs_err("missing reflection data for type '%s'", path);
         ecs_os_free(path);
         return -1;
     }
@@ -55895,7 +55924,7 @@ void flecs_meta_type_serializer_init(
         const EcsType *type_ptr = ecs_get(world, type, EcsType);
         if (!type_ptr) {
             char *path = ecs_get_path(world, type);
-            ecs_err("missing EcsType for type %s'", path);
+            ecs_err("missing reflection data for type '%s'", path);
             ecs_os_free(path);
             continue;
         }
@@ -67690,6 +67719,11 @@ ecs_table_memory_t ecs_table_memory_get(
 
     result.count = count;
 
+    flecs_sparse_memory_get(tables, ECS_SIZEOF(ecs_table_t), 
+        &result.bytes_table, 
+        &result.bytes_table_overhead, 
+        &result.bytes_table_overhead);
+
     for (i = 0; i < count; i++) {
         ecs_table_t *table = flecs_sparse_get_dense_t(tables, ecs_table_t, i);
         ecs_assert(table != NULL, ECS_INVALID_PARAMETER, NULL);
@@ -67701,7 +67735,6 @@ ecs_table_memory_t ecs_table_memory_get(
 
         result.column_count += column_count;
 
-        /* Populate entity count histogram using power-of-2 buckets */
         if (entity_count == 0) {
             result.empty_count++;
         }
@@ -67995,6 +68028,7 @@ void flecs_stats_memory_register_reflection(
             { .name = "empty_count", .type = ecs_id(ecs_i32_t) },
             { .name = "column_count", .type = ecs_id(ecs_i32_t) },
             { .name = "bytes_table", .type = ecs_id(ecs_i32_t), .unit = unit },
+            { .name = "bytes_table_overhead", .type = ecs_id(ecs_i32_t), .unit = unit },
             { .name = "bytes_type", .type = ecs_id(ecs_i32_t), .unit = unit },
             { .name = "bytes_entities", .type = ecs_id(ecs_i32_t), .unit = unit },
             { .name = "bytes_overrides", .type = ecs_id(ecs_i32_t), .unit = unit },

deps/flecs.h

@@ -13612,6 +13612,7 @@ typedef struct {
     int32_t empty_count;                /** Number of empty tables. */
     int32_t column_count;               /** Number of table columns. */
     ecs_size_t bytes_table;             /** Bytes used by ecs_table_t struct. */
+    ecs_size_t bytes_table_overhead;    /** Overhead bytes from table sparse set. */
     ecs_size_t bytes_type;              /** Bytes used by type vector. */
     ecs_size_t bytes_entities;          /** Bytes used by entity vectors. */
     ecs_size_t bytes_overrides;         /** Bytes used by table overrides. */

etc/js/components/widgets/title-bar/layout-control.vue

@@ -1,12 +1,10 @@
 <template>
-  <div class="layout-control">
-    <button @click="onToggle">
-      <icon 
-        :src="buttonIcon"
-        :opacity="0.7">
-      </icon>
-    </button>
-  </div>
+  <button @click="onToggle">
+    <icon 
+      :src="buttonIcon"
+      :opacity="0.7">
+    </icon>
+  </button>
 </template>
 
 <script>

etc/js/components/widgets/title-bar/refresh-control.vue

@@ -17,56 +17,6 @@ export default { name: "refresh-control" };
 <script setup>
 import { defineProps, defineModel, computed } from 'vue';
 
-const props = defineProps({
-  conn: {type: Object, required: true},
-});
-
-const app_params = defineModel("app_params");
-
-const autoRefresh = computed(() => {
-  return app_params.value.refresh === "auto";
-});
-
-const buttonText = computed(() => {
-  return autoRefresh.value ? "Auto refresh" : "Manual refresh";
-});
-
-const buttonIcon = computed(() => {
-  return autoRefresh.value ? "circle-large" : "refresh";
-});
-
-const buttonIconOpacity = computed(() => {
-  return autoRefresh.value ? 0.5 : 1.0;
-})
-
-function toggle() {
-  if (app_params.value.refresh === "auto") {
-    app_params.value.refresh = "manual";
-  } else {
-    app_params.value.refresh = "auto";
-  }
-
-  let poll_interval_ms = 1000;
-  if (app_params.value.refresh !== "auto") {
-    poll_interval_ms = 0;
-  }
-
-  props.conn.set_managed_params({ poll_interval_ms });
-}
-
-function request() {
-  if (!autoRefresh.value) {
-    props.conn.request_managed();
-  }
-}
-
-function refreshButtonCss() {
-  let classes = ["refresh-button"];
-  if (autoRefresh.value) {
-    classes.push("refresh-button-disabled");
-  }
-  return classes;
-}
 
 </script>