diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2007-04-17 18:03:58 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2007-04-17 18:03:58 +0000 |
| commit | 7c1ee090bf64dff298749744fd84b2bc22204a25 (patch) | |
| tree | d251d09c910cac5797a00cf138cada0be7155e39 /src | |
| parent | Added some new checks for directories to add them to the PATH before calling ... (diff) | |
| download | inkscape-7c1ee090bf64dff298749744fd84b2bc22204a25.tar.gz inkscape-7c1ee090bf64dff298749744fd84b2bc22204a25.zip | |
old default color values restored
(bzr r2914)
Diffstat (limited to 'src')
| -rw-r--r-- | src/display/canvas-grid.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index 7db2d4020..25700b2a6 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -28,6 +28,10 @@ namespace Inkscape { +#define DEFAULTGRIDCOLOR 0x0000FF20 +#define DEFAULTGRIDEMPCOLOR 0x0000FF40 + + static void grid_canvasitem_class_init (GridCanvasItemClass *klass); static void grid_canvasitem_init (GridCanvasItem *grid); static void grid_canvasitem_destroy (GtkObject *object); @@ -339,11 +343,8 @@ CanvasXYGrid::CanvasXYGrid (SPNamedView * nv, Inkscape::XML::Node * in_repr) : CanvasGrid(nv, in_repr), table(1, 1) { origin[NR::X] = origin[NR::Y] = 0.0; -// nv->gridcolor = (nv->gridcolor & 0xff) | (DEFAULTGRIDCOLOR & 0xffffff00); -// case SP_ATTR_GRIDOPACITY: -// nv->gridcolor = (nv->gridcolor & 0xffffff00) | (DEFAULTGRIDCOLOR & 0xff); - color = 0xff3f3f20; - empcolor = 0xFF3F3F40; + color = DEFAULTGRIDCOLOR; + empcolor = DEFAULTGRIDEMPCOLOR; empspacing = 5; spacing[NR::X] = spacing[NR::Y] = 8.0; gridunit = &sp_unit_get_by_id(SP_UNIT_PX); @@ -551,7 +552,6 @@ CanvasXYGrid::updateWidgets() _wr.setUpdating (true); -// _rrb_gridtype.setValue (nv->gridtype); _rumg.setUnit (gridunit); gdouble val; |