[haiku-commits] r40744 - haiku/trunk/src/apps/deskbar

  • From: fredrik.holmqvist@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 28 Feb 2011 22:27:29 +0100 (CET)

Author: tqh
Date: 2011-02-28 22:27:29 +0100 (Mon, 28 Feb 2011)
New Revision: 40744
Changeset: http://dev.haiku-os.org/changeset/40744

Modified:
   haiku/trunk/src/apps/deskbar/ExpandoMenuBar.cpp
   haiku/trunk/src/apps/deskbar/ExpandoMenuBar.h
   haiku/trunk/src/apps/deskbar/LICENSE
Log:
Starting to apply style cleanup patches by John Scipione from bug 7052.
This will force me to practice our code style.
(As a sidenote, we are aware of the no of patches in the bug). 


Modified: haiku/trunk/src/apps/deskbar/ExpandoMenuBar.cpp
===================================================================
--- haiku/trunk/src/apps/deskbar/ExpandoMenuBar.cpp     2011-02-28 21:26:23 UTC 
(rev 40743)
+++ haiku/trunk/src/apps/deskbar/ExpandoMenuBar.cpp     2011-02-28 21:27:29 UTC 
(rev 40744)
@@ -26,9 +26,10 @@
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered 
trademarks
-of Be Incorporated in the United States and other countries. Other brand 
product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks of Be Incorporated in the United States and other countries. Other
+brand product names are registered trademarks or trademarks of their respective
+holders.
 All rights reserved.
 */
 
@@ -118,8 +119,8 @@
                        R_BeLogoIcon);
                if (logoBitmap != NULL)
                        fBeMenuWidth = logoBitmap->Bounds().Width() + 16;
-               fBeMenuItem = new TBarMenuTitle(fBeMenuWidth, Frame().Height(),
-                       logoBitmap, beMenu, true);
+               fBeMenuItem = new TBarMenuTitle(fBeMenuWidth, Frame().Height(),
+                       logoBitmap, beMenu, true);
                AddItem(fBeMenuItem);
 
                fSeparatorItem = new TTeamMenuItem(kSepItemWidth, height, 
fVertical);
@@ -584,10 +585,10 @@
                                RemoveItem(i);
 
                                if (fVertical) {
-                                       //      instead of resizing the window 
here and there in the
-                                       //      code the resize method will be 
centered in one place
-                                       //      thus, the same behavior (good 
or bad) will be used
-                                       //      whereever window sizing is done
+                                       // instead of resizing the window here 
and there in the
+                                       // code the resize method will be 
centered in one place
+                                       // thus, the same behavior (good or 
bad) will be used
+                                       // whereever window sizing is done
                                        
fBarView->SizeWindow(BScreen(Window()).Frame());
                                } else
                                        CheckItemSizes(-1);
@@ -613,8 +614,8 @@
 
        if (!fBarView->Vertical()) {
                // in this case there are 2 extra items:
-               //              The Be Menu
-               //              The little separator item
+               //   - The Be Menu
+               //   - The little separator item
                fullWidth = fullWidth - (sMinimumWindowWidth * 2)
                        + (fBeMenuWidth + kSepItemWidth);
                width -= (fBeMenuWidth + kSepItemWidth);
@@ -624,11 +625,11 @@
        if (delta >= 0 && fullWidth > width) {
                fOverflow = true;
                reset = true;
-               newWidth = floorf(width/count);
+               newWidth = floorf(width / count);
        } else if (delta < 0 && fOverflow) {
                reset = true;
                if (fullWidth > width)
-                       newWidth = floorf(width/count);
+                       newWidth = floorf(width / count);
                else
                        newWidth = sMinimumWindowWidth;
        }
@@ -713,10 +714,9 @@
 TExpandoMenuBar::CheckForSizeOverrun()
 {
        BRect screenFrame = (BScreen(Window())).Frame();
-       if (fVertical)
-               fIsScrolling = Window()->Frame().bottom > screenFrame.bottom;
-       else
-               fIsScrolling = false;
+
+       fIsScrolling = fVertical ? Window()->Frame().bottom > screenFrame.bottom
+               : false;
 }
 
 
@@ -744,7 +744,7 @@
                        // Set all WindowMenuItems to require an update.
                        TWindowMenuItem* item = NULL;
                        for (int32 i = 0; i < totalItems; i++) {
-                               if (!teamMenu->SubmenuAt(i)){
+                               if (!teamMenu->SubmenuAt(i)) {
                                        item = 
static_cast<TWindowMenuItem*>(teamMenu->ItemAt(i));
                                        item->SetRequireUpdate();
                                }
@@ -814,7 +814,7 @@
 
                        // Remove any remaining items which require an update.
                        for (int32 i = 0; i < totalItems; i++) {
-                               if (!teamMenu->SubmenuAt(i)){
+                               if (!teamMenu->SubmenuAt(i)) {
                                        item = 
static_cast<TWindowMenuItem*>(teamMenu->ItemAt(i));
                                        if (item && item->RequiresUpdate()) {
                                                item = 
static_cast<TWindowMenuItem*>

Modified: haiku/trunk/src/apps/deskbar/ExpandoMenuBar.h
===================================================================
--- haiku/trunk/src/apps/deskbar/ExpandoMenuBar.h       2011-02-28 21:26:23 UTC 
(rev 40743)
+++ haiku/trunk/src/apps/deskbar/ExpandoMenuBar.h       2011-02-28 21:27:29 UTC 
(rev 40744)
@@ -26,17 +26,18 @@
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered 
trademarks
-of Be Incorporated in the United States and other countries. Other brand 
product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks of Be Incorporated in the United States and other countries. Other
+brand product names are registered trademarks or trademarks of their respective
+holders.
 All rights reserved.
 */
 #ifndef EXPANDO_MENU_BAR_H
 #define EXPANDO_MENU_BAR_H
 
-//     application list
-//     top level at window
-//     in expanded mode horizontal and vertical
+// application list
+// top level at window
+// in expanded mode horizontal and vertical
 
 
 #include <MenuBar.h>

Modified: haiku/trunk/src/apps/deskbar/LICENSE
===================================================================
--- haiku/trunk/src/apps/deskbar/LICENSE        2011-02-28 21:26:23 UTC (rev 
40743)
+++ haiku/trunk/src/apps/deskbar/LICENSE        2011-02-28 21:27:29 UTC (rev 
40744)
@@ -25,7 +25,8 @@
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered 
trademarks
-of Be Incorporated in the United States and other countries. Other brand 
product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks of Be Incorporated in the United States and other countries. Other
+brand product names are registered trademarks or trademarks of their respective
+holders.
 All rights reserved.


Other related posts:

  • » [haiku-commits] r40744 - haiku/trunk/src/apps/deskbar - fredrik . holmqvist