updates

luxe · Jul 21, 2024 · b684afc · b684afc
1 parent cad2506
commit b684afc
Show file tree

Hide file tree

Showing 15 changed files with 52 additions and 0 deletions.
diff --git a/source/code/programs/ide/frame/BUILD b/source/code/programs/ide/frame/BUILD
@@ -154,6 +154,7 @@ hcp_hdrs_derive(
         "//code/utilities/data_structures/graphics/objects/buildable_faced_tree:buildable_face_tree_is_mouse_over",
         "//code/utilities/data_structures/graphics/objects/buildable_schema_faced_tree:buildable_schema_face_tree_drawer",
         "//code/utilities/data_structures/graphics/objects/buttoned_faced_tree:button_face_tree_drawer",
+        "//code/utilities/data_structures/graphics/objects/faced_label:faced_label_drawer",
         "//code/utilities/data_structures/graphics/objects/cursor:cursor_drawer",
         "//code/utilities/data_structures/graphics/objects/cursor:label_cursor_action_doer",
         "//code/utilities/data_structures/graphics/objects/faced_grid:grid_label_drawer",
@@ -184,6 +185,7 @@ hcp_hdrs_derive(
         "//code/utilities/data_structures/graphics/objects/buildable_schema_faced_tree:buildable_schema_face_tree_drawer",
         "//code/utilities/data_structures/graphics/objects/buildable_schema_faced_tree:buildable_schema_faced_tree_is_mouse_over",
         "//code/utilities/data_structures/graphics/objects/buttoned_faced_tree:button_face_tree_drawer",
+        "//code/utilities/data_structures/graphics/objects/faced_label:faced_label_is_mouse_over",
         "//code/utilities/data_structures/graphics/objects/cursor:cursor_drawer",
         "//code/utilities/data_structures/graphics/objects/cursor:label_cursor_action_doer",
         "//code/utilities/data_structures/graphics/objects/faced_grid:grid_label_drawer",

diff --git a/source/code/programs/ide/frame/apply_schema_to_elements.hcp b/source/code/programs/ide/frame/apply_schema_to_elements.hcp
@@ -37,6 +37,10 @@ class
                 //NOT NEEDED
                 (void)x;
             },
+            [&](Positioned_Faced_Label & x) {
+                //NOT NEEDED
+                (void)x;
+            },
         }, it.element);
 ❱
 
@@ -73,5 +77,9 @@ class
                 //NOT NEEDED
                 (void)x;
             },
+            [&](Positioned_Faced_Label & x) {
+                //NOT NEEDED
+                (void)x;
+            },
         }, it.element);
 ❱
diff --git a/source/code/programs/ide/frame/convert_all_ide_elements.hcp b/source/code/programs/ide/frame/convert_all_ide_elements.hcp
@@ -52,6 +52,10 @@ class
                 //todo
                 results.frame_elements.types += Label_Drawer::Full_Draw(settings.desktop.unilang_font_lookup,x,pc_input).types;
             },
+            [&](Positioned_Faced_Label & x) {
+                //todo
+                results.frame_elements.types += Faced_Label_Drawer::Full_Draw(settings.desktop.unilang_font_lookup,x,pc_input).types;
+            },
         }, it.element);
     }
 

diff --git a/source/code/programs/ide/frame/find_mouse_over_index.hcp b/source/code/programs/ide/frame/find_mouse_over_index.hcp
@@ -40,6 +40,9 @@ class
             [&](Positioned_Label & x) {
                 was_performed = Label_Is_Mouse_Over::Check(x.pos, x.state, pc_input);
             },
+            [&](Positioned_Faced_Label & x) {
+                was_performed = Faced_Label_Is_Mouse_Over::Check(settings.desktop.unilang_font_lookup,x, x.pos, pc_input);
+            },
         }, it.element);
 
         if (was_performed){

diff --git a/source/code/programs/ide/frame/forward_compatible_element_upgrades.hcp b/source/code/programs/ide/frame/forward_compatible_element_upgrades.hcp
@@ -37,6 +37,10 @@ class
                 //NOT NEEDED
                 (void)x;
             },
+            [&](Positioned_Faced_Label & x) {
+                //NOT NEEDED
+                (void)x;
+            },
         }, it.element);
 
 ❱

diff --git a/source/code/programs/ide/frame/move_ide_element.hcp b/source/code/programs/ide/frame/move_ide_element.hcp
@@ -33,5 +33,9 @@ class
                 x.pos.x += pos.x;
                 x.pos.y += pos.y;
             },
+            [&](Positioned_Faced_Label & x) {
+                x.pos.x += pos.x;
+                x.pos.y += pos.y;
+            },
         }, it.element);
 ❱
diff --git a/source/code/programs/ide/frame/validate_ide_element.hcp b/source/code/programs/ide/frame/validate_ide_element.hcp
@@ -36,6 +36,10 @@ class
                 //NOT NEEDED
                 (void)x;
             },
+            [&](Positioned_Faced_Label const& x) {
+                //NOT NEEDED
+                (void)x;
+            },
         }, it.element);
 
 
@@ -76,6 +80,10 @@ class
                 //NOT NEEDED
                 (void)x;
             },
+            [&](Positioned_Faced_Label const& x) {
+                //NOT NEEDED
+                (void)x;
+            },
         }, it.element);
 
 

diff --git a/source/code/programs/ide/gl_context_element_load.hcp b/source/code/programs/ide/gl_context_element_load.hcp
@@ -27,6 +27,8 @@ class
             [&](Positioned_Rectangle_Settings & x) {
             },
             [&](Positioned_Label & x) {
+            },
+            [&](Positioned_Faced_Label & x) {
             }
         }, it.element);
 ❱
diff --git a/source/code/programs/ide/global_actions/global_element_builder.hcp b/source/code/programs/ide/global_actions/global_element_builder.hcp
@@ -42,6 +42,9 @@ class
         e.element = e2;
         settings.elements.types.emplace_back(e);
     }
+    else if (selected_item == "Add Positioned_Faced_Label"){
+        // 
+    }
     else if (selected_item == "Add Positioned_Image_Data"){
         //
     }

diff --git a/source/code/programs/ide/global_actions/main_menu_selector.hcp b/source/code/programs/ide/global_actions/main_menu_selector.hcp
@@ -33,6 +33,8 @@ class
             },
             [&](Positioned_Label & x) {
             },
+            [&](Positioned_Faced_Label & x) {
+            },
             [&](Positioned_Select_Menu & x) {
                 auto label = Tree_Label_Active_Finder::Find_Active_Label(x.menu);
                 if (label != x.menu.nodes.end()){

diff --git a/source/code/programs/ide/settings/data/BUILD b/source/code/programs/ide/settings/data/BUILD
@@ -62,6 +62,7 @@ hcp_hdrs_derive(
         "//code/utilities/data_structures/graphics/image:positioned_image_data",
         "//code/utilities/data_structures/graphics/objects/buildable_faced_tree/data:positioned_buildable_face_tree",
         "//code/utilities/data_structures/graphics/objects/buildable_schema_faced_tree/data:positioned_buildable_schema_faced_tree",
+        "//code/utilities/data_structures/graphics/objects/faced_label/data:positioned_faced_label",
         "//code/utilities/data_structures/graphics/objects/label/data:positioned_label",
         "//code/utilities/formats/json/converters:lib",
         "//code/utilities/formats/json/overloads:variant_json_converters",

diff --git a/source/code/programs/ide/settings/data/ide_element.hcp b/source/code/programs/ide/settings/data/ide_element.hcp
@@ -16,6 +16,7 @@ public:
 
         // Text-like boxes
         Positioned_Label,
+        Positioned_Faced_Label,
 
         // GUI Menu
         Positioned_Select_Menu,

diff --git a/source/code/programs/ide/settings/ide_default_settings_getter.hcp b/source/code/programs/ide/settings/ide_default_settings_getter.hcp
@@ -260,6 +260,9 @@ class
 
     face_label.state.faces[0].label.message = "Add Positioned_Label";
     x.menu.nodes.insert(top,face_label);
+
+    face_label.state.faces[0].label.message = "Add Positioned_Faced_Label";
+    x.menu.nodes.insert(top,face_label);
 
     face_label.state.faces[0].label.message = "Add Positioned_Image_Data";
     x.menu.nodes.insert(top,face_label);

diff --git a/source/code/utilities/code/save/state_to_code_converter.hcp b/source/code/utilities/code/save/state_to_code_converter.hcp
@@ -35,6 +35,10 @@ class
                 //don't care
                 (void)x;
             },
+            [&](Positioned_Faced_Label & x) {
+                //don't care
+                (void)x;
+            },
             [&](Positioned_Buildable_Schema_Faced_Tree & x) {
 
                 //tokenize

diff --git a/...code/utilities/data_structures/graphics/objects/faced_label/faced_label_is_mouse_over.hcp b/...code/utilities/data_structures/graphics/objects/faced_label/faced_label_is_mouse_over.hcp
@@ -3,6 +3,9 @@ class
 ⚞⚟
 
 
+◀public: static▶ bool ☀Check(Character_Maps const& font_chars, Positioned_Faced_Label & label, Position const& pos, Pc_Input_State const& pc_input)❰
+    return Do_Check(font_chars,label.state,pos,pc_input.mouse.pos);
+❱
 ◀public: static▶ bool ☀Check(Character_Maps const& font_chars, Faced_Label & label, Position const& pos, Pc_Input_State const& pc_input)❰
     return Do_Check(font_chars,label.state,pos,pc_input.mouse.pos);
 ❱