Changes in uspace/lib/gui/button.c [a35b458:5a6cc679] in mainline

File:

• uspace/lib/gui/button.c (modified) (10 diffs)

uspace/lib/gui/button.c

@@ -50 +50 @@
 {
         button_t *btn = (button_t *) widget;
-
+        
         surface_t *surface = window_claim(btn->widget.window);
         if (!surface)
                 window_yield(btn->widget.window);
-
+        
         source_t source;
         source_init(&source);
-
+        
         drawctx_t drawctx;
         drawctx_init(&drawctx, surface);
-
+        
         drawctx_set_source(&drawctx, &btn->background);
         drawctx_transfer(&drawctx, widget->hpos, widget->vpos,
             widget->width, widget->height);
-
+        
         if ((widget->width >= 8) && (widget->height >= 8)) {
                 drawctx_set_source(&drawctx, &source);
@@ -70 +70 @@
                     widget->width - 6, widget->height - 6, color_highlight,
                     color_shadow);
-
+                
                 drawctx_set_source(&drawctx, &btn->foreground);
                 drawctx_transfer(&drawctx, widget->hpos + 4, widget->vpos + 4,
                     widget->width - 8, widget->height - 8);
         }
-
+        
         sysarg_t cpt_width;
         sysarg_t cpt_height;
         font_get_box(btn->font, btn->caption, &cpt_width, &cpt_height);
-
+        
         if ((widget->width >= cpt_width) && (widget->height >= cpt_height)) {
                 sysarg_t x = ((widget->width - cpt_width) / 2) + widget->hpos;
                 sysarg_t y = ((widget->height - cpt_height) / 2) + widget->vpos;
-
+                
                 drawctx_set_source(&drawctx, &btn->text);
                 drawctx_set_font(&drawctx, btn->font);
-
+                
                 if (btn->caption)
                         drawctx_print(&drawctx, btn->caption, x, y);
         }
-
+        
         window_yield(btn->widget.window);
 }
@@ -104 +104 @@
 {
         button_t *btn = (button_t *) widget;
-
+        
         deinit_button(btn);
         free(btn);
@@ -130 +130 @@
 {
         button_t *btn = (button_t *) widget;
-
+        
         if (event.key == KC_ENTER && event.type == KEY_PRESS)
                 sig_send(&btn->clicked, NULL);
@@ -139 +139 @@
         button_t *btn = (button_t *) widget;
         widget->window->focus = widget;
-
+        
         // TODO make the click logic more robust (mouse grabbing, mouse moves)
         if (event.btn_num == 1) {
@@ -152 +152 @@
 {
         widget_init(&btn->widget, parent, data);
-
+        
         btn->widget.destroy = button_destroy;
         btn->widget.reconfigure = button_reconfigure;
@@ -159 +159 @@
         btn->widget.handle_keyboard_event = button_handle_keyboard_event;
         btn->widget.handle_position_event = button_handle_position_event;
-
+        
         source_init(&btn->background);
         source_set_color(&btn->background, background);
-
+        
         source_init(&btn->foreground);
         source_set_color(&btn->foreground, foreground);
-
+        
         source_init(&btn->text);
         source_set_color(&btn->text, text);
-
+        
         if (caption == NULL)
                 btn->caption = NULL;
         else
                 btn->caption = str_dup(caption);
-
+        
         errno_t rc = embedded_font_create(&btn->font, points);
         if (rc != EOK) {
@@ -180 +180 @@
                 return false;
         }
-
+        
         sysarg_t cpt_width;
         sysarg_t cpt_height;
@@ -188 +188 @@
         btn->widget.width_ideal = cpt_width + 30;
         btn->widget.height_ideal = cpt_height + 10;
-
+        
         return true;
 }
@@ -198 +198 @@
         if (!btn)
                 return NULL;
-
+        
         if (init_button(btn, parent, data, caption, points, background, foreground,
             text))
                 return btn;
-
+        
         free(btn);
         return NULL;