summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2014-11-27 15:29:54 +0000
committerAlbrecht Schlosser <albrechts.fltk@online.de>2014-11-27 15:29:54 +0000
commit979756355244b3327a99a90a3e603168b1ba3e2e (patch)
tree914f4d4deb2adf07d3f4cf4a0f874bbc923a9283
parente7e8faa25b55e36c8cc085f8737082f3319dcae5 (diff)
Improve code formatting according to CMP.
Add one pair of braces for clarity, move some other braces and else statements around. There's more to that, but these were minimal changes to improve readability for solving STR #3043. There are no real code changes involved though. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10474 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--src/Fl_File_Browser.cxx29
1 files changed, 11 insertions, 18 deletions
diff --git a/src/Fl_File_Browser.cxx b/src/Fl_File_Browser.cxx
index 09f6731cc..17ff1afbd 100644
--- a/src/Fl_File_Browser.cxx
+++ b/src/Fl_File_Browser.cxx
@@ -351,9 +351,8 @@ Fl_File_Browser::item_draw(void *p, // I - List item data
else
fl_color(fl_inactive(c));
- for (t = line->txt, ptr = fragment; *t != '\0'; t ++)
- if (*t == '\n')
- {
+ for (t = line->txt, ptr = fragment; *t != '\0'; t ++) {
+ if (*t == '\n') {
// Newline - nul terminate this fragment and draw it...
*ptr = '\0';
@@ -365,21 +364,18 @@ Fl_File_Browser::item_draw(void *p, // I - List item data
width = 0;
Y += fl_height();
column = 0;
- }
- else if (*t == column_char())
- {
+ } else if (*t == column_char()) {
// Tab - nul terminate this fragment and draw it...
*ptr = '\0';
int cW = W - width; // Clip width...
- if (columns)
- {
- // Try clipping inside this column...
+ if (columns) {
+ // Try clipping inside this column...
for (i = 0; i < column && columns[i]; i ++) { ; }
- if (columns[i])
- cW = columns[i];
+ if (columns[i])
+ cW = columns[i];
}
fl_draw(fragment, X + width, Y, cW, fl_height(),
@@ -387,21 +383,18 @@ Fl_File_Browser::item_draw(void *p, // I - List item data
// Advance to the next column...
column ++;
- if (columns)
- {
+ if (columns) {
for (i = 0, width = 0; i < column && columns[i]; i ++)
width += columns[i];
}
else
- width = column * (int)(fl_height() * 0.6 * 8.0);
-
+ width = column * (int)(fl_height() * 0.6 * 8.0);
ptr = fragment;
}
else
*ptr++ = *t;
-
- if (ptr > fragment)
- {
+ }
+ if (ptr > fragment) {
// Nul terminate this fragment and draw it...
*ptr = '\0';