Changeset a35b458 in mainline for uspace/lib/gui/label.c

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• uspace/lib/gui/label.c (modified) (7 diffs)

uspace/lib/gui/label.c

@@ -50 +50 @@
         if (!surface)
                 window_yield(lbl->widget.window);
-        
+
         drawctx_t drawctx;
         drawctx_init(&drawctx, surface);
-        
+
         drawctx_set_source(&drawctx, &lbl->background);
         drawctx_transfer(&drawctx, widget->hpos, widget->vpos, widget->width,
             widget->height);
-        
+
         sysarg_t cpt_width;
         sysarg_t cpt_height;
         font_get_box(lbl->font, lbl->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, &lbl->text);
                 drawctx_set_font(&drawctx, lbl->font);
-                
+
                 if (lbl->caption)
                         drawctx_print(&drawctx, lbl->caption, x, y);
         }
-        
+
         window_yield(lbl->widget.window);
 }
@@ -80 +80 @@
         if (data != NULL) {
                 label_t *lbl = (label_t *) widget;
-                
+
                 const char *new_caption = (const char *) data;
                 lbl->caption = str_dup(new_caption);
-                
+
                 sysarg_t cpt_width;
                 sysarg_t cpt_height;
                 font_get_box(lbl->font, lbl->caption, &cpt_width, &cpt_height);
-                
+
                 lbl->widget.width_min = cpt_width + 4;
                 lbl->widget.height_min = cpt_height + 4;
                 lbl->widget.width_ideal = lbl->widget.width_min;
                 lbl->widget.height_ideal = lbl->widget.height_min;
-                
+
                 window_refresh(lbl->widget.window);
         }
@@ -107 +107 @@
 {
         label_t *lbl = (label_t *) widget;
-        
+
         deinit_label(lbl);
         free(lbl);
@@ -144 +144 @@
 {
         widget_init(&lbl->widget, parent, data);
-        
+
         lbl->widget.destroy = label_destroy;
         lbl->widget.reconfigure = label_reconfigure;
@@ -151 +151 @@
         lbl->widget.handle_keyboard_event = label_handle_keyboard_event;
         lbl->widget.handle_position_event = label_handle_position_event;
-        
+
         source_init(&lbl->background);
         source_set_color(&lbl->background, background);
-        
+
         source_init(&lbl->text);
         source_set_color(&lbl->text, text);
-        
+
         if (caption == NULL)
                 lbl->caption = NULL;
         else
                 lbl->caption = str_dup(caption);
-        
+
         errno_t rc = embedded_font_create(&lbl->font, points);
         if (rc != EOK) {
@@ -169 +169 @@
                 return false;
         }
-        
+
         sysarg_t cpt_width;
         sysarg_t cpt_height;
         font_get_box(lbl->font, lbl->caption, &cpt_width, &cpt_height);
-        
+
         lbl->widget.width_min = cpt_width + 4;
         lbl->widget.height_min = cpt_height + 4;
         lbl->widget.width_ideal = lbl->widget.width_min;
         lbl->widget.height_ideal = lbl->widget.height_min;
-        
+
         lbl->rewrite = on_rewrite;
-        
+
         return true;
 }
@@ -190 +190 @@
         if (!lbl)
                 return NULL;
-        
+
         if (init_label(lbl, parent, data, caption, points, background, text))
                 return lbl;
-        
+
         free(lbl);
         return NULL;