wallet: make the beautiful box resize but preserve border width

bin/darkwallet/client.py

@@ -1,138 +1,4 @@
 #!/usr/bin/python
-# Ping a peer
-from pydrk import Api, exc, ErrorCode, HostApi, SceneNodeType, PropertyType, vertex, face, serial
 import gui
-import sys, zmq
-
-def clear_layer(layer_path):
-    layer_id = api.lookup_node_id("/window/layer2")
-    if layer_id is None:
-        return
-
-    win_id = api.lookup_node_id("/window")
-    api.unlink_node(layer_id, win_id)
-
-    for (_, child_id, child_type) in api.get_children(layer_id):
-        api.unlink_node(child_id, layer_id)
-        if child_type == SceneNodeType.RENDER_OBJECT:
-            remove_node_recursive(child_id)
-
-    api.remove_node(layer_id)
-
-def recalc_areas():
-    print("recalc areas")
-    w = get_property("/window", "width")
-    h = get_property("/window", "height")
-    set_property("/window/layer2", "rect_w", int(w))
-    set_property("/window/layer2", "rect_h", int(h))
-
-    gui.print_tree()
-
-#api = Api()
-#host = HostApi(api)
-#print(api.hello())
-#
-#garbage_collect()
-#clear_layer("/window/layer2")
-#
-#print("Generating scene...")
-#subsock = make_sub_socket()
-#
-#register_slot("/window",                "resize",        b"resize")
-#register_slot("/window/input/mouse",    "button_down",   b"click")
-#register_slot("/window/input/mouse",    "wheel",         b"wheel")
-##register_slot("/window/input/mouse",    "move",          b"mouse")
-#
-#layer_id = api.add_node("layer2", SceneNodeType.RENDER_LAYER)
-#api.add_property(layer_id, "rect_x", PropertyType.UINT32)
-#api.add_property(layer_id, "rect_y", PropertyType.UINT32)
-#api.add_property(layer_id, "rect_w", PropertyType.UINT32)
-#api.add_property(layer_id, "rect_h", PropertyType.UINT32)
-#api.add_property(layer_id, "is_visible", PropertyType.BOOL)
-#api.set_property_bool(layer_id, "is_visible", True)
-#win_id = api.lookup_node_id("/window")
-#api.link_node(layer_id, win_id)
-#
-#if True:
-#    layer_id = api.lookup_node_id("/window/layer2")
-#
-#    obj_id = api.add_node("obj1", SceneNodeType.RENDER_OBJECT)
-#    api.add_property(obj_id, "x", PropertyType.FLOAT32)
-#    api.add_property(obj_id, "y", PropertyType.FLOAT32)
-#    api.add_property(obj_id, "scale", PropertyType.FLOAT32)
-#    api.set_property_f32(obj_id, "scale", 1.0)
-#
-#    mesh_id = api.add_node("mesh", SceneNodeType.RENDER_MESH)
-#    api.add_property(mesh_id, "verts", PropertyType.BUFFER)
-#    api.add_property(mesh_id, "faces", PropertyType.BUFFER)
-#
-#    texture_id = host.load_texture("da_king", "king.png")
-#    api.link_node(texture_id, obj_id)
-#    # To preserve the ratio, we should do this when resize happens too
-#    texture_w = api.get_property(texture_id, "width")
-#    texture_h = api.get_property(texture_id, "width")
-#    texture_ratio = texture_w / texture_h
-#    screen_w = get_property("/window", "width")
-#    screen_h = get_property("/window", "height")
-#    screen_ratio = screen_w / screen_h
-#    aspect_ratio = texture_ratio / screen_ratio
-#
-#    #api.set_property_bool("/window/layer2", "is_visible", False)
-#    # Lets add a poly - must be counterclockwise
-#    x, y = 0.25, 0.25
-#    w, h = 0.5 * aspect_ratio, 0.5
-#    vert1 = vertex(x,     y,     1, 1, 1, 1, 0, 0)
-#    vert2 = vertex(x + w, y,     1, 1, 1, 1, 1, 0)
-#    vert3 = vertex(x,     y + h, 1, 1, 1, 1, 0, 1)
-#    vert4 = vertex(x + w, y + h, 1, 1, 1, 1, 1, 1)
-#    api.set_property_buffer(mesh_id, "verts", vert1 + vert2 + vert3 + vert4)
-#    api.set_property_buffer(mesh_id, "faces", face(0, 2, 1) + face(1, 2, 3))
-#
-#    api.link_node(mesh_id, obj_id)
-#    api.link_node(obj_id, layer_id)
-#
-#if True:
-#    layer_id = api.lookup_node_id("/window/layer2")
-#    obj_id = api.add_node("obj", SceneNodeType.RENDER_OBJECT)
-#    api.add_property(obj_id, "x", PropertyType.FLOAT32)
-#    api.add_property(obj_id, "y", PropertyType.FLOAT32)
-#    api.add_property(obj_id, "scale", PropertyType.FLOAT32)
-#    api.set_property_f32(obj_id, "scale", 1.0)
-#
-#    # Call method
-#    text_id = host.create_text(
-#        "/font/inter-regular", "mytxt2", "hello world", 34
-#    )
-#    if text_id is None:
-#        sys.exit(-1)
-#    print("create text node id:", text_id)
-#
-#    api.set_property_f32(obj_id, "x", 0.5)
-#    api.set_property_f32(text_id, "r", 1.0)
-#    api.set_property_f32(text_id, "g", 1.0)
-#    api.set_property_f32(text_id, "b", 1.0)
-#    api.set_property_f32(text_id, "a", 1.0)
-#
-#    api.link_node(text_id, obj_id)
-#    api.link_node(obj_id, layer_id)
-#
-## Screen init
-#recalc_areas()
-#
-#gui.print_tree()
-#print()
-#print("Scene created.")
-#
-#while True:
-#    data = subsock.recv()
-#    match data:
-#        case b"resize":
-#            recalc_areas()
-#        case b"click":
-#            x = get_property("/window/input/mouse", "x")
-#            y = get_property("/window/input/mouse", "y")
-#            print(f"mouse clicked ({x}, {y})")
-#        case b"wheel":
-#            print("mouse wheely")
-#
 gui.main()
+

bin/darkwallet/gui/__init__.py

@@ -17,8 +17,8 @@ class App(EventLoop):
         self.chatbox_layer.add_obj("outline")
 
     def resize_event(self, w, h):
-        print(f"resize ({w}, {h})")
         self.chatbox_layer.resize(w, h)
+        resize_box()
 
     def mouse_click(self, x, y):
         print(f"mouse click ({x}, {y})")
@@ -37,11 +37,24 @@ class App(EventLoop):
             print(settings.ui_scale)
 
 def draw_box():
-    from pydrk import SceneNodeType, PropertyType, vertex, face
+    from pydrk import SceneNodeType, PropertyType
 
     mesh_id = api.add_node("box", SceneNodeType.RENDER_MESH)
     api.add_property(mesh_id, "verts", PropertyType.BUFFER)
     api.add_property(mesh_id, "faces", PropertyType.BUFFER)
+    link_node(mesh_id, "/window/chatbox_layer/outline")
+
+    mesh_id = api.add_node("inner_box", SceneNodeType.RENDER_MESH)
+    api.add_property(mesh_id, "verts", PropertyType.BUFFER)
+    api.add_property(mesh_id, "faces", PropertyType.BUFFER)
+    link_node(mesh_id, "/window/chatbox_layer/outline")
+
+    resize_box()
+
+def resize_box():
+    from pydrk import vertex, face
+
+    mesh_id = api.lookup_node_id("/window/chatbox_layer/outline/box")
 
     # Lets add a poly - must be counterclockwise
     x, y = 0.25, 0.25
@@ -53,8 +66,6 @@ def draw_box():
     api.set_property_buffer(mesh_id, "verts", vert1 + vert2 + vert3 + vert4)
     api.set_property_buffer(mesh_id, "faces", face(0, 2, 1) + face(1, 2, 3))
 
-    link_node(mesh_id, "/window/chatbox_layer/outline")
-
     # Second mesh
     w = get_property("/window/chatbox_layer", "rect_w")
     h = get_property("/window/chatbox_layer", "rect_h")
@@ -62,9 +73,7 @@ def draw_box():
     border_size = 5
     bx, by = 5/w, 5/h
 
-    mesh_id = api.add_node("inner_box", SceneNodeType.RENDER_MESH)
-    api.add_property(mesh_id, "verts", PropertyType.BUFFER)
-    api.add_property(mesh_id, "faces", PropertyType.BUFFER)
+    mesh_id = api.lookup_node_id("/window/chatbox_layer/outline/inner_box")
 
     x, y = 0.25 + bx, 0.25 + by
     w, h = 0.50 - 2*bx, 0.50 - 2*by
@@ -75,8 +84,6 @@ def draw_box():
     api.set_property_buffer(mesh_id, "verts", vert1 + vert2 + vert3 + vert4)
     api.set_property_buffer(mesh_id, "faces", face(0, 2, 1) + face(1, 2, 3))
 
-    link_node(mesh_id, "/window/chatbox_layer/outline")
-
 def main():
     garbage_collect()