diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-12-21 19:58:38 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-12-21 19:58:38 +0000 |
| commit | 6c78ab7deeea3b32791437ade35e8911e7c73c8e (patch) | |
| tree | 1392ce928e20bb52690af343f1a1f44dae2935b7 /src/ui/tools | |
| parent | Deprecate and remove sp_desktop_selection in favor of SPDesktop::getSelection (diff) | |
| download | inkscape-6c78ab7deeea3b32791437ade35e8911e7c73c8e.tar.gz inkscape-6c78ab7deeea3b32791437ade35e8911e7c73c8e.zip | |
Purge sp_desktop_namedview in favor of SPDesktop::getNamedView
(bzr r13810)
Diffstat (limited to 'src/ui/tools')
| -rw-r--r-- | src/ui/tools/dropper-tool.cpp | 2 | ||||
| -rw-r--r-- | src/ui/tools/flood-tool.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp index 56bd1598b..3c0b9f60b 100644 --- a/src/ui/tools/dropper-tool.cpp +++ b/src/ui/tools/dropper-tool.cpp @@ -245,7 +245,7 @@ bool DropperTool::root_handler(GdkEvent* event) { if (pick == SP_DROPPER_PICK_VISIBLE) { // compose with page color - guint32 bg = sp_desktop_namedview(desktop)->pagecolor; + guint32 bg = desktop->getNamedView()->pagecolor; R = R + (SP_RGBA32_R_F(bg)) * (1 - A); G = G + (SP_RGBA32_G_F(bg)) * (1 - A); B = B + (SP_RGBA32_B_F(bg)) * (1 - A); diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp index 339ff1c72..b6808fbc2 100644 --- a/src/ui/tools/flood-tool.cpp +++ b/src/ui/tools/flood-tool.cpp @@ -792,7 +792,7 @@ static void sp_flood_do_flood_fill(ToolBase *event_context, GdkEvent *event, boo Inkscape::DrawingContext dc(s, Geom::Point(0,0)); // cairo_translate not necessary here - surface origin is at 0,0 - SPNamedView *nv = sp_desktop_namedview(desktop); + SPNamedView *nv = desktop->getNamedView(); bgcolor = nv->pagecolor; // bgcolor is 0xrrggbbaa, we need 0xaarrggbb dtc = (bgcolor >> 8) | (bgcolor << 24); |