summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/display/guideline.cpp4
-rw-r--r--src/display/snap-indicator.cpp6
-rw-r--r--src/display/sodipodi-ctrl.cpp8
-rw-r--r--src/display/sodipodi-ctrl.h4
-rw-r--r--src/knot.cpp4
-rw-r--r--src/line-geometry.cpp2
-rw-r--r--src/line-geometry.h2
-rw-r--r--src/selcue.cpp4
-rw-r--r--src/seltrans.cpp8
-rw-r--r--src/ui/control-manager.cpp52
-rw-r--r--src/ui/tool/control-point.cpp8
-rw-r--r--src/ui/tools/box3d-tool.cpp3
-rw-r--r--src/ui/tools/measure-tool.cpp2
13 files changed, 52 insertions, 55 deletions
diff --git a/src/display/guideline.cpp b/src/display/guideline.cpp
index 6dcc6d402..8d738cdb2 100644
--- a/src/display/guideline.cpp
+++ b/src/display/guideline.cpp
@@ -186,11 +186,11 @@ static void sp_guideline_update(SPCanvasItem *item, Geom::Affine const &affine,
if (gl->locked) {
g_object_set(G_OBJECT(gl->origin), "stroke_color", 0x0000ff88,
"shape", SP_CTRL_SHAPE_CROSS,
- "size", 7.0, NULL);
+ "size", 7, NULL);
} else {
g_object_set(G_OBJECT(gl->origin), "stroke_color", 0xff000088,
"shape", SP_CTRL_SHAPE_CIRCLE,
- "size", 5.0, NULL);
+ "size", 5, NULL);
}
gl->origin->moveto(gl->point_on_line);
sp_canvas_item_request_update(SP_CANVAS_ITEM(gl->origin));
diff --git a/src/display/snap-indicator.cpp b/src/display/snap-indicator.cpp
index ebd017c64..cb798e612 100644
--- a/src/display/snap-indicator.cpp
+++ b/src/display/snap-indicator.cpp
@@ -250,7 +250,7 @@ SnapIndicator::set_new_snaptarget(Inkscape::SnappedPoint const &p, bool pre_snap
canvasitem = sp_canvas_item_new(_desktop->getTempGroup(),
SP_TYPE_CTRL,
"anchor", SP_ANCHOR_CENTER,
- "size", 11.0,
+ "size", 11,
"stroked", TRUE,
"stroke_color", pre_snap ? 0x7f7f7fff : 0xff0000ff,
"mode", SP_KNOT_MODE_XOR,
@@ -372,7 +372,7 @@ SnapIndicator::set_new_snapsource(Inkscape::SnapCandidatePoint const &p)
SPCanvasItem * canvasitem = sp_canvas_item_new( _desktop->getTempGroup(),
SP_TYPE_CTRL,
"anchor", SP_ANCHOR_CENTER,
- "size", 7.0,
+ "size", 7,
"stroked", TRUE,
"stroke_color", 0xff0000ff,
"mode", SP_KNOT_MODE_XOR,
@@ -391,7 +391,7 @@ SnapIndicator::set_new_debugging_point(Geom::Point const &p)
SPCanvasItem * canvasitem = sp_canvas_item_new( _desktop->getTempGroup(),
SP_TYPE_CTRL,
"anchor", SP_ANCHOR_CENTER,
- "size", 11.0,
+ "size", 11,
"fill_color", 0x00ff00ff,
"stroked", FALSE,
"mode", SP_KNOT_MODE_XOR,
diff --git a/src/display/sodipodi-ctrl.cpp b/src/display/sodipodi-ctrl.cpp
index a48ec4cd8..cf0ee2d89 100644
--- a/src/display/sodipodi-ctrl.cpp
+++ b/src/display/sodipodi-ctrl.cpp
@@ -60,9 +60,9 @@ sp_ctrl_class_init (SPCtrlClass *klass)
g_object_class_install_property (g_object_class,
ARG_MODE, g_param_spec_int ("mode", "mode", "Mode", 0, G_MAXINT, SP_CTRL_MODE_COLOR, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (g_object_class,
- ARG_ANCHOR, g_param_spec_int ("anchor", "anchor", "Anchor", 0, G_MAXINT, SP_ANCHOR_CENTER, (GParamFlags) G_PARAM_READWRITE));
+ ARG_ANCHOR, g_param_spec_int ("anchor", "anchor", "Anchor", 0, G_MAXUINT, SP_ANCHOR_CENTER, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (g_object_class,
- ARG_SIZE, g_param_spec_double ("size", "size", "Size", 0.0, G_MAXDOUBLE, 8.0, (GParamFlags) G_PARAM_READWRITE));
+ ARG_SIZE, g_param_spec_uint ("size", "size", "Size", 0, G_MAXINT, 7, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (g_object_class,
ARG_ANGLE, g_param_spec_double ("angle", "angle", "Angle", -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (g_object_class,
@@ -104,7 +104,7 @@ sp_ctrl_set_property(GObject *object, guint prop_id, const GValue *value, GParam
ctrl->anchor = (SPAnchorType) g_value_get_int(value);
break;
case ARG_SIZE:
- ctrl->width = (gint) g_value_get_double(value);
+ ctrl->width = g_value_get_uint(value);
ctrl->height = ctrl->width;
ctrl->defined = (ctrl->width > 0);
break;
@@ -164,7 +164,7 @@ sp_ctrl_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec
break;
case ARG_SIZE:
- g_value_set_double(value, ctrl->width/2.0);
+ g_value_set_uint(value, ctrl->width);
break;
case ARG_ANGLE:
diff --git a/src/display/sodipodi-ctrl.h b/src/display/sodipodi-ctrl.h
index 2d26e3832..184c77eec 100644
--- a/src/display/sodipodi-ctrl.h
+++ b/src/display/sodipodi-ctrl.h
@@ -47,8 +47,8 @@ struct SPCtrl : public SPCanvasItem {
SPCtrlShapeType shape;
SPCtrlModeType mode;
SPAnchorType anchor;
- gdouble width;
- gdouble height;
+ unsigned int width;
+ unsigned int height;
guint defined : 1;
guint shown : 1;
diff --git a/src/knot.cpp b/src/knot.cpp
index 58df9cac9..cc464c75c 100644
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -114,7 +114,7 @@ SPKnot::SPKnot(SPDesktop *desktop, gchar const *tip)
this->item = sp_canvas_item_new(desktop->getControls(),
SP_TYPE_CTRL,
"anchor", SP_ANCHOR_CENTER,
- "size", 9.0,
+ "size", 9,
"angle", 0.0,
"filled", TRUE,
"fill_color", 0xffffff00,
@@ -458,7 +458,7 @@ void SPKnot::updateCtrl() {
g_object_set(this->item, "shape", this->shape, NULL);
g_object_set(this->item, "mode", this->mode, NULL);
- g_object_set(this->item, "size", (gdouble) this->size, NULL);
+ g_object_set(this->item, "size", this->size, NULL);
g_object_set(this->item, "angle", this->angle, NULL);
g_object_set(this->item, "anchor", this->anchor, NULL);
diff --git a/src/line-geometry.cpp b/src/line-geometry.cpp
index f75d177ee..1951bd558 100644
--- a/src/line-geometry.cpp
+++ b/src/line-geometry.cpp
@@ -187,7 +187,7 @@ boost::optional<Geom::Point> Line::intersection_with_viewbox (SPDesktop *desktop
return this->intersect (line);
}
-void create_canvas_point(Geom::Point const &pos, double size, guint32 rgba)
+void create_canvas_point(Geom::Point const &pos, unsigned int size, guint32 rgba)
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
SPCanvasItem * canvas_pt = sp_canvas_item_new(desktop->getControls(), SP_TYPE_CTRL,
diff --git a/src/line-geometry.h b/src/line-geometry.h
index 3709c5853..65e5c248e 100644
--- a/src/line-geometry.h
+++ b/src/line-geometry.h
@@ -73,7 +73,7 @@ std::pair<Geom::Point, Geom::Point> side_of_intersection (Geom::Point const &A,
Geom::Point const &pt, Geom::Point const &dir);
/*** For debugging purposes: Draw a knot/node of specified size and color at the given position ***/
-void create_canvas_point(Geom::Point const &pos, double size = 4.0, guint32 rgba = 0xff00007f);
+void create_canvas_point(Geom::Point const &pos, unsigned int size = 4, guint32 rgba = 0xff00007f);
/*** For debugging purposes: Draw a line between the specified points ***/
void create_canvas_line(Geom::Point const &p1, Geom::Point const &p2, guint32 rgba = 0xff00007f);
diff --git a/src/selcue.cpp b/src/selcue.cpp
index 9a276325f..2bab05d41 100644
--- a/src/selcue.cpp
+++ b/src/selcue.cpp
@@ -162,7 +162,7 @@ void Inkscape::SelCue::_newItemBboxes()
SP_TYPE_CTRL,
"mode", SP_CTRL_MODE_XOR,
"shape", SP_CTRL_SHAPE_DIAMOND,
- "size", 6.0,
+ "size", 6,
"filled", TRUE,
"fill_color", 0x000000ff,
"stroked", FALSE,
@@ -214,7 +214,7 @@ void Inkscape::SelCue::_newTextBaselines()
if (pt) {
baseline_point = sp_canvas_item_new(_desktop->getControls(), SP_TYPE_CTRL,
"mode", SP_CTRL_MODE_XOR,
- "size", 5.0,
+ "size", 5,
"filled", 0,
"stroked", 1,
"stroke_color", 0x000000ff,
diff --git a/src/seltrans.cpp b/src/seltrans.cpp
index 46cf9d88b..ff3804acb 100644
--- a/src/seltrans.cpp
+++ b/src/seltrans.cpp
@@ -139,7 +139,7 @@ Inkscape::SelTrans::SelTrans(SPDesktop *desktop) :
"anchor", SP_ANCHOR_CENTER,
"mode", SP_CTRL_MODE_XOR,
"shape", SP_CTRL_SHAPE_BITMAP,
- "size", 13.0,
+ "size", 13,
"filled", TRUE,
"fill_color", 0x00000000,
"stroked", TRUE,
@@ -152,7 +152,7 @@ Inkscape::SelTrans::SelTrans(SPDesktop *desktop) :
"anchor", SP_ANCHOR_CENTER,
"mode", SP_CTRL_MODE_XOR,
"shape", SP_CTRL_SHAPE_CROSS,
- "size", 7.0,
+ "size", 7,
"filled", TRUE,
"fill_color", 0xffffff7f,
"stroked", TRUE,
@@ -762,7 +762,7 @@ void Inkscape::SelTrans::handleGrab(SPKnot *knot, guint /*state*/, SPSelTransHan
case HANDLE_CENTER:
g_object_set(G_OBJECT(_grip),
"shape", SP_CTRL_SHAPE_BITMAP,
- "size", 13.0,
+ "size", 13,
NULL);
sp_canvas_item_hide(_norm);
sp_canvas_item_show(_grip);
@@ -770,7 +770,7 @@ void Inkscape::SelTrans::handleGrab(SPKnot *knot, guint /*state*/, SPSelTransHan
default:
g_object_set(G_OBJECT(_grip),
"shape", SP_CTRL_SHAPE_CROSS,
- "size", 7.0,
+ "size", 7,
NULL);
sp_canvas_item_show(_norm);
sp_canvas_item_show(_grip);
diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp
index c1e4d857c..153799f2a 100644
--- a/src/ui/control-manager.cpp
+++ b/src/ui/control-manager.cpp
@@ -26,8 +26,6 @@ using Inkscape::ControlFlags;
namespace {
-std::map<Inkscape::ControlType, std::vector<int> > sizeTable;
-
// Note: The following operator overloads are local to this file at the moment to discourage flag manipulation elsewhere.
/*
ControlFlags operator |(ControlFlags lhs, ControlFlags rhs)
@@ -110,7 +108,7 @@ private:
int _size; // Size from the grabsize preference
int _resize; // Way size should change from grabsize
std::vector<SPCanvasItem *> _itemList;
- std::map<Inkscape::ControlType, std::vector<int> > _sizeTable;
+ std::map<Inkscape::ControlType, std::vector<unsigned int> > _sizeTable;
std::map<Inkscape::ControlType, GType> _typeTable;
std::map<Inkscape::ControlType, SPCtrlShapeType> _ctrlToShape;
std::set<Inkscape::ControlType> _resizeOnSelect;
@@ -168,37 +166,37 @@ ControlManagerImpl::ControlManagerImpl(ControlManager &manager) :
// or guides, which are 1 px wide. It is not possible to accurately center a control to them if the
// control has an even width).
{
- int sizes[] = {7, 7, 7, 7, 7, 7, 7};
- _sizeTable[CTRL_TYPE_UNKNOWN] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+ unsigned int sizes[] = {7, 7, 7, 7, 7, 7, 7};
+ _sizeTable[CTRL_TYPE_UNKNOWN] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
}
{
- int sizes[] = {3, 5, 7, 9, 11, 13, 15};
- _sizeTable[CTRL_TYPE_ANCHOR] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+ unsigned int sizes[] = {3, 5, 7, 9, 11, 13, 15};
+ _sizeTable[CTRL_TYPE_ANCHOR] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
}
{
- int sizes[] = {3, 5, 7, 9, 11, 13, 15};
- _sizeTable[CTRL_TYPE_ADJ_HANDLE] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+ unsigned int sizes[] = {3, 5, 7, 9, 11, 13, 15};
+ _sizeTable[CTRL_TYPE_ADJ_HANDLE] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
}
{
- int sizes[] = {5, 7, 9, 11, 13, 15, 17};
- _sizeTable[CTRL_TYPE_POINT] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
- _sizeTable[CTRL_TYPE_ROTATE] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
- _sizeTable[CTRL_TYPE_SIZER] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
- _sizeTable[CTRL_TYPE_SHAPER] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+ unsigned int sizes[] = {5, 7, 9, 11, 13, 15, 17};
+ _sizeTable[CTRL_TYPE_POINT] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+ _sizeTable[CTRL_TYPE_ROTATE] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+ _sizeTable[CTRL_TYPE_SIZER] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+ _sizeTable[CTRL_TYPE_SHAPER] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
}
{
- int sizes[] = {5, 7, 9, 11, 13, 15, 17};
- _sizeTable[CTRL_TYPE_NODE_AUTO] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
- _sizeTable[CTRL_TYPE_NODE_CUSP] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+ unsigned int sizes[] = {5, 7, 9, 11, 13, 15, 17};
+ _sizeTable[CTRL_TYPE_NODE_AUTO] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+ _sizeTable[CTRL_TYPE_NODE_CUSP] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
}
{
- int sizes[] = {3, 5, 7, 9, 11, 13, 15};
- _sizeTable[CTRL_TYPE_NODE_SMOOTH] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
- _sizeTable[CTRL_TYPE_NODE_SYMETRICAL] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+ unsigned int sizes[] = {3, 5, 7, 9, 11, 13, 15};
+ _sizeTable[CTRL_TYPE_NODE_SMOOTH] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+ _sizeTable[CTRL_TYPE_NODE_SYMETRICAL] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
}
{
- int sizes[] = {1, 1, 1, 1, 1, 1, 1};
- _sizeTable[CTRL_TYPE_INVISIPOINT] = std::vector<int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
+ unsigned int sizes[] = {1, 1, 1, 1, 1, 1, 1};
+ _sizeTable[CTRL_TYPE_INVISIPOINT] = std::vector<unsigned int>(sizes, sizes + (sizeof(sizes) / sizeof(sizes[0])));
}
}
@@ -224,7 +222,7 @@ void ControlManagerImpl::setControlSize(int size, bool force)
SPCanvasItem *ControlManagerImpl::createControl(SPCanvasGroup *parent, ControlType type)
{
SPCanvasItem *item = nullptr;
- double targetSize = _sizeTable[type][_size - 1];
+ unsigned int targetSize = _sizeTable[type][_size - 1];
switch (type)
{
case CTRL_TYPE_ADJ_HANDLE:
@@ -291,7 +289,7 @@ sigc::connection ControlManagerImpl::connectCtrlSizeChanged(const sigc::slot<voi
void ControlManagerImpl::updateItem(SPCanvasItem *item)
{
if (item) {
- double target = _sizeTable[item->ctrlType][_size - 1] + item->ctrlResize;
+ unsigned int target = _sizeTable[item->ctrlType][_size - 1] + item->ctrlResize;
g_object_set(item, "size", target, NULL);
sp_canvas_item_request_update(item);
@@ -306,7 +304,7 @@ bool ControlManagerImpl::setControlType(SPCanvasItem *item, ControlType type)
accepted = true;
} else if (item) {
if (_ctrlToShape.count(type) && (_typeTable[type] == _typeTable[item->ctrlType])) { // compatible?
- double targetSize = _sizeTable[type][_size - 1] + item->ctrlResize;
+ unsigned int targetSize = _sizeTable[type][_size - 1] + item->ctrlResize;
SPCtrlShapeType targetShape = _ctrlToShape[type];
g_object_set(item, "shape", targetShape, "size", targetSize, NULL);
@@ -326,7 +324,7 @@ bool ControlManagerImpl::setControlResize(SPCanvasItem *item, int ctrlResize)
// is also odd
if(item) {
item->ctrlResize = ctrlResize;
- double targetSize = _sizeTable[item->ctrlType][_size - 1] + item->ctrlResize;
+ unsigned int targetSize = _sizeTable[item->ctrlType][_size - 1] + item->ctrlResize;
g_object_set(item, "size", targetSize, NULL);
return true;
}
@@ -345,7 +343,7 @@ void ControlManagerImpl::setSelected(SPCanvasItem *item, bool selected)
}
// TODO refresh colors
- double targetSize = _sizeTable[item->ctrlType][_size - 1] + item->ctrlResize;
+ unsigned int targetSize = _sizeTable[item->ctrlType][_size - 1] + item->ctrlResize;
g_object_set(item, "size", targetSize, NULL);
}
}
diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp
index dfa165804..f47951c2c 100644
--- a/src/ui/tool/control-point.cpp
+++ b/src/ui/tool/control-point.cpp
@@ -80,7 +80,7 @@ ControlPoint::ControlPoint(SPDesktop *d, Geom::Point const &initial_pos, SPAncho
{
_canvas_item = sp_canvas_item_new(
group ? group : _desktop->getControls(), SP_TYPE_CTRL,
- "anchor", (SPAnchorType) anchor, "size", (gdouble) pixbuf->get_width(),
+ "anchor", (SPAnchorType) anchor, "size", (unsigned int) pixbuf->get_width(),
"shape", SP_CTRL_SHAPE_BITMAP, "pixbuf", pixbuf->gobj(),
"filled", TRUE, "fill_color", _cset.normal.fill,
"stroked", TRUE, "stroke_color", _cset.normal.stroke,
@@ -167,9 +167,9 @@ Glib::ustring ControlPoint::format_tip(char const *format, ...)
unsigned int ControlPoint::_size() const
{
- double ret;
+ unsigned int ret;
g_object_get(_canvas_item, "size", &ret, NULL);
- return static_cast<unsigned int>(ret);
+ return ret;
}
SPCtrlShapeType ControlPoint::_shape() const
@@ -197,7 +197,7 @@ Glib::RefPtr<Gdk::Pixbuf> ControlPoint::_pixbuf()
void ControlPoint::_setSize(unsigned int size)
{
- g_object_set(_canvas_item, "size", (gdouble) size, NULL);
+ g_object_set(_canvas_item, "size", size, NULL);
}
bool ControlPoint::_setControlType(Inkscape::ControlType type)
diff --git a/src/ui/tools/box3d-tool.cpp b/src/ui/tools/box3d-tool.cpp
index f54e07784..9df0ef34e 100644
--- a/src/ui/tools/box3d-tool.cpp
+++ b/src/ui/tools/box3d-tool.cpp
@@ -397,8 +397,7 @@ bool Box3dTool::root_handler(GdkEvent* event) {
/* FOR DEBUGGING PURPOSES
case GDK_O:
if (MOD__CTRL(event) && MOD__SHIFT(event)) {
- Box3D::create_canvas_point(persp3d_get_VP(document()->getCurrentPersp3D(), Proj::W).affine(),
- 7, 0xff00ff00);
+ Box3D::create_canvas_point(persp3d_get_VP(document()->getCurrentPersp3D(), Proj::W).affine(), 7, 0xff00ff00);
}
ret = true;
break;
diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 3c706fbc6..e2dae85a5 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -1080,7 +1080,7 @@ void MeasureTool::setMeasureCanvasItem(Geom::Point position, bool to_item, bool
SPCanvasItem * canvasitem = sp_canvas_item_new(desktop->getTempGroup(),
SP_TYPE_CTRL,
"anchor", SP_ANCHOR_CENTER,
- "size", 9.0,
+ "size", 9,
"stroked", TRUE,
"stroke_color", color,
"mode", SP_KNOT_MODE_XOR,
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-27 21:25:59 +0000