Changeset 61b5b73d in mainline

Timestamp:

2014-01-17T14:33:02Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

476f62c, 66be0288

Parents:

6a3d0c7

Message:

make the title bar more subtle, change the close icon to the easily recognizable cross

Location:

uspace

Files:

• app/vterm/vterm.c (modified) (1 diff)
• lib/gui/common.c (modified) (1 diff)
• lib/gui/common.h (modified) (1 diff)
• lib/gui/window.c (modified) (2 diffs)

uspace/app/vterm/vterm.c

@@ -55 +55 @@
         }
         
-        window_resize(main_window, 0, 0, 648, 510, WINDOW_PLACEMENT_ANY);
+        window_resize(main_window, 0, 0, 648, 508, WINDOW_PLACEMENT_ANY);
         terminal_t *terminal_widget =
             create_terminal(window_root(main_window), 640, 480);

uspace/lib/gui/common.c

@@ -38 +38 @@
 #include "common.h"
 
+#define CROSS_WIDTH   14
+#define CROSS_HEIGHT  14
+
+static uint8_t cross_texture[] = {
+        0x00, 0x00, 0x02, 0x08, 0x04, 0x04, 0x08, 0x02, 0x10, 0x01, 0xa0, 0x00,
+        0x40, 0x00, 0xa0, 0x00, 0x10, 0x01, 0x08, 0x02, 0x04, 0x04, 0x02, 0x08,
+        0x01, 0x10, 0x00, 0x00
+};
+
+static uint8_t cross_mask[] = {
+        0x00, 0x00, 0x02, 0x18, 0x06, 0x0c, 0x0c, 0x06, 0x18, 0x03, 0xb0, 0x01,
+        0xe0, 0x00, 0xe0, 0x00, 0xb0, 0x01, 0x18, 0x03, 0x0c, 0x06, 0x06, 0x0c,
+        0x03, 0x18, 0x00, 0x00
+};
+
+void draw_icon_cross(surface_t *surface, sysarg_t hpos, sysarg_t vpos,
+    pixel_t highlight, pixel_t shadow)
+{
+        for (unsigned int y = 0; y < CROSS_HEIGHT; y++) {
+                for (unsigned int x = 0; x < CROSS_WIDTH; x++) {
+                        size_t offset = y * ((CROSS_WIDTH - 1) / 8 + 1) + x / 8;
+                        bool visible = cross_mask[offset] & (1 << (x % 8));
+                        pixel_t pixel = (cross_texture[offset] & (1 << (x % 8))) ?
+                            highlight : shadow;
+                        
+                        if (visible)
+                                surface_put_pixel(surface, hpos + x, vpos + y, pixel);
+                }
+        }
+}
+
 void draw_bevel(drawctx_t *drawctx, source_t *source, sysarg_t hpos,
     sysarg_t vpos, sysarg_t width, sysarg_t height, pixel_t highlight,

uspace/lib/gui/common.h

@@ -40 +40 @@
 #include <drawctx.h>
 
+extern void draw_icon_cross(surface_t *, sysarg_t, sysarg_t, pixel_t, pixel_t);
 extern void draw_bevel(drawctx_t *, source_t *, sysarg_t, sysarg_t, sysarg_t,
     sysarg_t, pixel_t, pixel_t);

uspace/lib/gui/window.c

@@ -63 +63 @@
 static sysarg_t border_thickness = 4;
 static sysarg_t bevel_thickness = 1;
-static sysarg_t header_height = 22;
+static sysarg_t header_height = 20;
 static sysarg_t header_min_width = 40;
-static sysarg_t close_thickness = 22;
+static sysarg_t close_thickness = 20;
 
 static pixel_t color_highlight = PIXEL(255, 255, 255, 255);
@@ -155 +155 @@
         /* Close button icon */
         
-        draw_bevel(&drawctx, &source, close_hpos + 6, close_vpos + 9,
-            close_thickness - 12, close_thickness - 18, color_highlight,
-            color_shadow);
+        draw_icon_cross(surface, close_hpos + 3, close_vpos + 3,
+            color_highlight, color_shadow);
         
         /* Window caption */