diff --git a/src/desktop.h b/src/desktop.h
index 27439ebccd91c71fa0613fd9f05b80429d4bf7df..af2473bafaa729759e18de38bb564f9989b4a2e2 100644 (file)
--- a/src/desktop.h
+++ b/src/desktop.h
#include <gtk/gtktypeutils.h>
#include <sigc++/sigc++.h>
-#include "libnr/nr-matrix.h"
-#include "libnr/nr-matrix-fns.h"
-#include "libnr/nr-rect.h"
+#include <2geom/matrix.h>
+#include <2geom/rect.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;
-typedef struct _GtkWidget GtkWidget;
struct SPCanvas;
struct SPCanvasItem;
struct SPCanvasGroup;
SPCanvasItem *page; ///< page background
SPCanvasItem *page_border; ///< page border
SPCSSAttr *current; ///< current style
+ bool _focusMode; ///< Whether we're focused working or general working
GList *zooms_past;
GList *zooms_future;
+ bool _quick_zoom_enabled; ///< Signifies that currently we're in quick zoom mode
+ Geom::Rect _quick_zoom_stored_area; ///< The area of the screen before quick zoom
unsigned int dkey;
unsigned int number;
guint window_state;
sigc::signal<void, SPObject *> _layer_changed_signal;
sigc::signal<bool, const SPCSSAttr *>::accumulated<StopOnTrue> _set_style_signal;
sigc::signal<int, SPStyle *, int>::accumulated<StopOnNonZero> _query_style_signal;
+
+ /// Emitted when the zoom factor changes (not emitted when scrolling).
+ /// The parameter is the new zoom factor
+ sigc::signal<void, double> signal_zoom_changed;
+
sigc::connection connectDocumentReplaced (const sigc::slot<void,SPDesktop*,SPDocument*> & slot)
{
return _document_replaced_signal.connect (slot);
#endif
SPDesktop();
- void init (SPNamedView* nv, SPCanvas* canvas);
+ void init (SPNamedView* nv, SPCanvas* canvas, Inkscape::UI::View::EditWidgetInterface *widget);
virtual ~SPDesktop();
void destroy();
void setDisplayModeOutline() {
_setDisplayMode(Inkscape::RENDERMODE_OUTLINE);
}
+// void setDisplayModePrintColorsPreview() {
+// _setDisplayMode(Inkscape::RENDERMODE_PRINT_COLORS_PREVIEW);
+// }
void displayModeToggle();
Inkscape::RenderMode _display_mode;
- Inkscape::RenderMode _saved_display_mode;
Inkscape::RenderMode getMode() const { return _display_mode; }
Inkscape::UI::Widget::Dock* getDock() { return _widget->getDock(); }
SPItem *group_at_point (Geom::Point const p) const;
Geom::Point point() const;
- NR::Rect get_display_area() const;
+ Geom::Rect get_display_area() const;
void set_display_area (double x0, double y0, double x1, double y1, double border, bool log = true);
- void set_display_area(NR::Rect const &a, NR::Coord border, bool log = true);
+ void set_display_area(Geom::Rect const &a, Geom::Coord border, bool log = true);
void zoom_absolute (double cx, double cy, double zoom);
void zoom_relative (double cx, double cy, double zoom);
void zoom_absolute_keep_point (double cx, double cy, double px, double py, double zoom);
void zoom_relative_keep_point (double cx, double cy, double zoom);
void zoom_relative_keep_point (Geom::Point const &c, double const zoom)
{
- using NR::X;
- using NR::Y;
- zoom_relative_keep_point (c[X], c[Y], zoom);
+ zoom_relative_keep_point (c[Geom::X], c[Geom::Y], zoom);
}
void zoom_page();
void zoom_drawing();
void zoom_selection();
void zoom_grab_focus();
- double current_zoom() const { return NR::expansion(_d2w); }
+ double current_zoom() const { return _d2w.descrim(); }
void prev_zoom();
void next_zoom();
+ void zoom_quick(bool enable = true);
+ /** \brief Returns whether the desktop is in quick zoom mode or not */
+ bool quick_zoomed(void) { return _quick_zoom_enabled; }
bool scroll_to_point (Geom::Point const &s_dt, gdouble autoscrollspeed = 0);
void scroll_world (double dx, double dy, bool is_scrolling = false);
void scroll_world (Geom::Point const scroll, bool is_scrolling = false)
{
- using NR::X;
- using NR::Y;
- scroll_world(scroll[X], scroll[Y], is_scrolling);
+ scroll_world(scroll[Geom::X], scroll[Geom::Y], is_scrolling);
}
void scroll_world_in_svg_coords (double dx, double dy, bool is_scrolling = false);
void setWaitingCursor();
void clearWaitingCursor();
+ bool isWaitingCursor() const { return waiting_cursor; };
void toggleColorProfAdjust();
void toggleGrids();
- void toggleSnapping();
- bool gridsEnabled() { return grids_visible; }
+ void toggleSnapGlobal();
+ bool gridsEnabled() const { return grids_visible; };
void showGrids(bool show, bool dirty_document = true);
bool is_iconified();
bool is_maximized();
bool is_fullscreen();
+ bool is_focusMode();
void iconify();
void maximize();
void fullscreen();
-
- void registerEditWidget (Inkscape::UI::View::EditWidgetInterface *widget)
- { _widget = widget; }
+ void focusMode(bool mode = true);
Geom::Matrix w2d() const; //transformation from window to desktop coordinates (used for zooming)
Geom::Point w2d(Geom::Point const &p) const;
Geom::Point d2w(Geom::Point const &p) const;
Geom::Matrix doc2dt() const;
+ Geom::Matrix dt2doc() const;
Geom::Point doc2dt(Geom::Point const &p) const;
Geom::Point dt2doc(Geom::Point const &p) const;