From 07970e811680c5d30cd9258ecb07f8cb7a9307c6 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 10 Jun 2010 23:50:10 -0300
Subject: [PATCH] Removed app_get_fg/bg_color() functions.

---
 src/app.cpp                   | 22 ----------------------
 src/app.h                     |  2 --
 src/widgets/editor/cursor.cpp | 19 ++++++++++++++++++-
 3 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/app.cpp b/src/app.cpp
index 2c8e30bb9..ab96c1f86 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -443,28 +443,6 @@ void app_default_statusbar_message()
     ->setStatusText(250, "%s %s | %s", PACKAGE, VERSION, COPYRIGHT);
 }
 
-int app_get_fg_color(Sprite *sprite)
-{
-  color_t c = colorbar->getFgColor();
-  assert(sprite != NULL);
-
-  if (sprite->getCurrentLayer() != NULL)
-    return get_color_for_layer(sprite->getCurrentLayer(), c);
-  else
-    return get_color_for_image(sprite->getImgType(), c);
-}
-
-int app_get_bg_color(Sprite *sprite)
-{
-  color_t c = colorbar->getBgColor();
-  assert(sprite != NULL);
-
-  if (sprite->getCurrentLayer() != NULL)
-    return get_color_for_layer(sprite->getCurrentLayer(), c);
-  else
-    return get_color_for_image(sprite->getImgType(), c);
-}
-
 int app_get_color_to_clear_layer(Layer *layer)
 {
   /* all transparent layers are cleared with the mask color */
diff --git a/src/app.h b/src/app.h
index bfbdb1519..2e639488a 100644
--- a/src/app.h
+++ b/src/app.h
@@ -77,8 +77,6 @@ Widget* app_get_tabsbar();
 
 void app_default_statusbar_message();
 
-int app_get_fg_color(Sprite* sprite);
-int app_get_bg_color(Sprite* sprite);
 int app_get_color_to_clear_layer(Layer* layer);
 
 #endif
diff --git a/src/widgets/editor/cursor.cpp b/src/widgets/editor/cursor.cpp
index df41c3d7e..54c5dc531 100644
--- a/src/widgets/editor/cursor.cpp
+++ b/src/widgets/editor/cursor.cpp
@@ -91,6 +91,8 @@ static void cleanpixel(BITMAP *bmp, int x, int y, int color);
 
 static int point_inside_region(int x, int y, JRegion region);
 
+static int get_pen_color(Sprite *sprite);
+
 //////////////////////////////////////////////////////////////////////
 // CURSOR COLOR
 //////////////////////////////////////////////////////////////////////
@@ -269,7 +271,7 @@ void Editor::editor_draw_cursor(int x, int y, bool refresh)
       ->getSettings()
       ->getToolSettings(current_tool);
 
-    int pen_color = app_get_fg_color(m_sprite);
+    int pen_color = get_pen_color(m_sprite);
     int new_mask_color;
     Pen* pen = editor_get_current_pen();
 
@@ -658,3 +660,18 @@ static int point_inside_region(int x, int y, JRegion region)
   struct jrect box;
   return jregion_point_in(region, x, y, &box);
 }
+
+static int get_pen_color(Sprite *sprite)
+{
+  color_t c = UIContext::instance()->getSettings()->getFgColor();
+  assert(sprite != NULL);
+
+  // Avoid using invalid colors
+  if (!color_is_valid(c))
+    return 0;
+
+  if (sprite->getCurrentLayer() != NULL)
+    return get_color_for_layer(sprite->getCurrentLayer(), c);
+  else
+    return get_color_for_image(sprite->getImgType(), c);
+}