Remove custom color wheel widget in favor of the (relatively) recent GtkHSV. Fixes...

[inkscape.git] / src / flood-context.cpp

diff --git a/src/flood-context.cpp b/src/flood-context.cpp
index 910b5dd808d367cd6883db829f18128064b31061..282ccbeb6285b81004fb5f6bce783c080997a24e 100644 (file)
--- a/src/flood-context.cpp
+++ b/src/flood-context.cpp
@@ -261,10 +261,10 @@ GList * flood_channels_dropdown_items_list() {
 GList * flood_autogap_dropdown_items_list() {
     GList *glist = NULL;
 
-    glist = g_list_append (glist, _("None"));
-    glist = g_list_append (glist, _("Small"));
-    glist = g_list_append (glist, _("Medium"));
-    glist = g_list_append (glist, _("Large"));
+    glist = g_list_append (glist, (void*) C_("Flood autogap", "None"));
+    glist = g_list_append (glist, (void*) C_("Flood autogap", "Small"));
+    glist = g_list_append (glist, (void*) C_("Flood autogap", "Medium"));
+    glist = g_list_append (glist, (void*) C_("Flood autogap", "Large"));
 
     return glist;
 }
@@ -798,7 +798,7 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
     unsigned int height = (int)ceil(screen.height() * zoom_scale * padding);
 
     Geom::Point origin(screen.min()[Geom::X],
-                       screen.min()[Geom::Y]);
+                       sp_document_height(document) - screen.height() - screen.min()[Geom::Y]);
                     
     origin[Geom::X] = origin[Geom::X] + (screen.width() * ((1 - padding) / 2));
     origin[Geom::Y] = origin[Geom::Y] + (screen.height() * ((1 - padding) / 2));
@@ -905,7 +905,7 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
     }
 
     for (unsigned int i = 0; i < fill_points.size(); i++) {
-        Geom::Point pw = Geom::Point(fill_points[i][Geom::X] / zoom_scale, (fill_points[i][Geom::Y] / zoom_scale)) * affine;
+        Geom::Point pw = Geom::Point(fill_points[i][Geom::X] / zoom_scale, sp_document_height(document) + (fill_points[i][Geom::Y] / zoom_scale)) * affine;
 
         pw[Geom::X] = (int)MIN(width - 1, MAX(0, pw[Geom::X]));
         pw[Geom::Y] = (int)MIN(height - 1, MAX(0, pw[Geom::Y]));
@@ -1300,4 +1300,4 @@ void flood_channels_set_channels( gint channels )
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :