[haiku-commits] haiku: hrev44969 - src/apps/terminal

  • From: jscipione@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 7 Dec 2012 01:59:48 +0100 (CET)

hrev44969 adds 2 changesets to branch 'master'
old head: 715c56d45435a373b9f581960fd352506a348922
new head: 5ddf877be64a8d6aa12e6f856d3b748c5ba045d4
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=5ddf877+%5E715c56d

----------------------------------------------------------------------------

72bf9c4: Make Default color scheme match default settings...
  
  So that it gets selected, well, by default. Before Custom was
  being selected initially.

5ddf877: More style fixes, return true or false directly

                                     [ John Scipione <jscipione@xxxxxxxxx> ]

----------------------------------------------------------------------------

1 file changed, 11 insertions(+), 14 deletions(-)
src/apps/terminal/Colors.cpp | 25 +++++++++++--------------

############################################################################

Commit:      72bf9c4e480784cde000b41982f3afb6f7d00e2a
URL:         http://cgit.haiku-os.org/haiku/commit/?id=72bf9c4
Author:      John Scipione <jscipione@xxxxxxxxx>
Date:        Fri Dec  7 00:34:12 2012 UTC

Make Default color scheme match default settings...

So that it gets selected, well, by default. Before Custom was
being selected initially.

----------------------------------------------------------------------------

diff --git a/src/apps/terminal/Colors.cpp b/src/apps/terminal/Colors.cpp
index 1eae1d6..161727d 100644
--- a/src/apps/terminal/Colors.cpp
+++ b/src/apps/terminal/Colors.cpp
@@ -24,7 +24,7 @@ const struct color_scheme kColorSchemeDefault = {
        B_TRANSLATE("Default"),
        kBlack,
        kWhite,
-       kWhite,
+       kBlack,
        kBlack,
        kWhite,
        kBlack

############################################################################

Revision:    hrev44969
Commit:      5ddf877be64a8d6aa12e6f856d3b748c5ba045d4
URL:         http://cgit.haiku-os.org/haiku/commit/?id=5ddf877
Author:      John Scipione <jscipione@xxxxxxxxx>
Date:        Fri Dec  7 00:38:15 2012 UTC

More style fixes, return true or false directly

----------------------------------------------------------------------------

diff --git a/src/apps/terminal/Colors.cpp b/src/apps/terminal/Colors.cpp
index 161727d..7d89c64 100644
--- a/src/apps/terminal/Colors.cpp
+++ b/src/apps/terminal/Colors.cpp
@@ -85,27 +85,24 @@ struct color_scheme gCustomColorScheme = {
 };
 
 const color_scheme* gPredefinedColorSchemes[] = {
-               &kColorSchemeDefault,
-               &kColorSchemeBlue,
-               &kColorSchemeMidnight,
-               &kColorSchemeProfessional,
-               &kColorSchemeRetro,
-               &kColorSchemeSlate,
-               &gCustomColorScheme,
-               NULL
+       &kColorSchemeDefault,
+       &kColorSchemeBlue,
+       &kColorSchemeMidnight,
+       &kColorSchemeProfessional,
+       &kColorSchemeRetro,
+       &kColorSchemeSlate,
+       &gCustomColorScheme,
+       NULL
 };
 
 
 bool
 color_scheme::operator==(const color_scheme& scheme)
 {
-       if (text_fore_color == scheme.text_fore_color
+       return text_fore_color == scheme.text_fore_color
                && text_back_color == scheme.text_back_color
                && cursor_fore_color == scheme.cursor_fore_color
                && cursor_back_color == scheme.cursor_back_color
                && select_fore_color == scheme.select_fore_color
-               && select_back_color == scheme.select_back_color)
-               return true;
-
-       return false;
+               && select_back_color == scheme.select_back_color;
 }


Other related posts:

  • » [haiku-commits] haiku: hrev44969 - src/apps/terminal - jscipione