Changeset c37c24c in mainline for uspace/lib/ui/src/wdecor.c

Timestamp:

2024-04-07T09:52:47Z (14 months ago)

Author:

Nataliia Korop <n.corop08@…>

Children:

e55d2c1

Parents:

6c1e7c0 (diff), 34aad53d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'topic/packet-capture' into topic/packet-capture-choose-nic

File:

• uspace/lib/ui/src/wdecor.c (modified) (4 diffs)

uspace/lib/ui/src/wdecor.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -45 +45 @@
 #include <ui/paint.h>
 #include <ui/pbutton.h>
+#include <ui/ui.h>
 #include <ui/wdecor.h>
 #include "../private/resource.h"
@@ -94 +95 @@
         /** Window resizing edge height */
         wdecor_edge_h = 4,
+        /** Window resizing edge witdth */
+        wdecor_edge_w_text = 1,
+        /** Window resizing edge height */
+        wdecor_edge_h_text = 1,
         /** Title bar height */
         wdecor_tbar_h = 22,
@@ -860 +865 @@
  * and its decoration.
  *
+ * @param ui UI
  * @param style Decoration style
  * @param app Application area rectangle
  * @param rect Place to store (outer) window decoration rectangle
  */
-void ui_wdecor_rect_from_app(ui_wdecor_style_t style, gfx_rect_t *app,
-    gfx_rect_t *rect)
-{
+void ui_wdecor_rect_from_app(ui_t *ui, ui_wdecor_style_t style,
+    gfx_rect_t *app, gfx_rect_t *rect)
+{
+        bool textmode;
+        gfx_coord_t edge_w, edge_h;
         *rect = *app;
 
+        textmode = ui_is_textmode(ui);
+        if (textmode) {
+                edge_w = wdecor_edge_w_text;
+                edge_h = wdecor_edge_h_text;
+        } else {
+                edge_w = wdecor_edge_w;
+                edge_h = wdecor_edge_h;
+        }
+
         if ((style & ui_wds_frame) != 0) {
-                rect->p0.x -= wdecor_edge_w;
-                rect->p0.y -= wdecor_edge_h;
-                rect->p1.x += wdecor_edge_w;
-                rect->p1.y += wdecor_edge_h;
-        }
-
-        if ((style & ui_wds_titlebar) != 0)
-                rect->p0.y -= 22;
+                rect->p0.x -= edge_w;
+                rect->p0.y -= edge_h;
+                rect->p1.x += edge_w;
+                rect->p1.y += edge_h;
+        }
+
+        if ((style & ui_wds_titlebar) != 0 && !textmode)
+                rect->p0.y -= wdecor_tbar_h;
 }