diff --git a/src/desktop.h b/src/desktop.h
index 84b8297268f83672b71f2a3c65e6c86bb1bb7fa9..af0d41b2a573ff7335480670e114e1faee43ab77 100644 (file)
--- a/src/desktop.h
+++ b/src/desktop.h
#include "ui/view/view.h"
#include "ui/view/edit-widget-interface.h"
+#include "display/rendermode.h"
+#include "display/snap-indicator.h"
+
class NRRect;
class SPCSSAttr;
struct _GtkWidget;
namespace Whiteboard {
class SessionManager;
}
+ namespace Display {
+ class TemporaryItemList;
+ class TemporaryItem;
+ //class SnapIndicator;
+ }
}
/**
Inkscape::LayerManager *layer_manager;
Inkscape::EventLog *event_log;
+ Inkscape::Display::TemporaryItemList *temporary_item_list;
+ Inkscape::Display::SnapIndicator *snapindicator;
+
SPCanvasItem *acetate;
SPCanvasGroup *main;
SPCanvasGroup *gridgroup;
SPCanvasItem *drawing;
SPCanvasGroup *sketch;
SPCanvasGroup *controls;
+ SPCanvasGroup *tempgroup; ///< contains temporary canvas items
SPCanvasItem *table; ///< outside-of-page background
SPCanvasItem *page; ///< page background
SPCanvasItem *page_border; ///< page border
return _guides_message_context;
}
- void setDisplayModeNormal();
- void setDisplayModeOutline();
+ Inkscape::Display::TemporaryItem * add_temporary_canvasitem (SPCanvasItem *item, guint lifetime, bool move_to_bottom = true);
+ void remove_temporary_canvasitem (Inkscape::Display::TemporaryItem * tempitem);
+
+ void _setDisplayMode(Inkscape::RenderMode mode);
+ void setDisplayModeNormal() {
+ _setDisplayMode(Inkscape::RENDERMODE_NORMAL);
+ }
+ void setDisplayModeNoFilters() {
+ _setDisplayMode(Inkscape::RENDERMODE_NO_FILTERS);
+ }
+ void setDisplayModeOutline() {
+ _setDisplayMode(Inkscape::RENDERMODE_OUTLINE);
+ }
void displayModeToggle();
- int displayMode;
- int getMode() const { return displayMode; }
+ Inkscape::RenderMode _display_mode;
+ Inkscape::RenderMode _saved_display_mode;
+ Inkscape::RenderMode getMode() const { return _display_mode; }
Inkscape::UI::Widget::Dock* getDock() { return _widget->getDock(); }
void zoom_drawing();
void zoom_selection();
void zoom_grab_focus();
- double current_zoom() const { return _d2w.expansion(); }
+ double current_zoom() const { return NR::expansion(_d2w); }
void prev_zoom();
void next_zoom();
using NR::Y;
scroll_world(scroll[X], scroll[Y], is_scrolling);
}
+ void scroll_world_in_svg_coords (double dx, double dy, bool is_scrolling = false);
void getWindowGeometry (gint &x, gint &y, gint &w, gint &h);
void setWindowPosition (NR::Point p);