~7-eric/inkscape/boolop-fix

« back to all changes in this revision

Viewing changes to src/text-editing.cpp

Committer: Matthew Petroff
Date: 2013-08-06 18:54:40 UTC
mfrom: (12380.1.63 gsoc-2013-unit-refactor)
Revision ID: matthew@mpetroff.net-20130806185440-etxvnmedelj8273o

Merge Google Summer of Code unit refactor.

files added:
src/ui/widget/unit-tracker.cpp

src/ui/widget/unit-tracker.h

files removed:
src/helper/unit-menu.cpp

src/helper/unit-menu.h

src/helper/unit-tracker.cpp

src/helper/unit-tracker.h

src/helper/units-test.h

src/helper/units.cpp

src/helper/units.h

src/sp-metric.h

src/sp-metrics.cpp

src/sp-metrics.h

src/unit-constants.h

files modified:
AUTHORS

src/CMakeLists.txt

src/Makefile_insert

src/arc-context.cpp

src/box3d-context.cpp

src/desktop-events.cpp

src/desktop.cpp

src/display/canvas-axonomgrid.cpp

src/display/canvas-grid.cpp

src/display/canvas-grid.h

src/document.cpp

src/document.h

src/doxygen-main.cpp

src/extension/internal/cairo-render-context.cpp

src/extension/internal/cairo-renderer-pdf-out.cpp

src/extension/internal/cairo-renderer.cpp

src/extension/internal/emf-win32-inout.cpp

src/extension/internal/emf-win32-print.cpp

src/extension/internal/gdkpixbuf-input.cpp

src/extension/internal/latex-pstricks.cpp

src/extension/internal/latex-text-renderer.cpp

src/extension/internal/pdfinput/pdf-parser.cpp

src/extension/internal/pdfinput/svg-builder.cpp

src/flood-context.cpp

src/flood-context.h

src/helper/Makefile_insert

src/helper/pixbuf-ops.cpp

src/live_effects/lpe-path_length.cpp

src/live_effects/lpe-ruler.cpp

src/live_effects/parameter/unit.cpp

src/live_effects/parameter/unit.h

src/lpe-tool-context.cpp

src/lpe-tool-context.h

src/main.cpp

src/measure-context.cpp

src/pen-context.cpp

src/preferences.cpp

src/rect-context.cpp

src/selection-chemistry.cpp

src/seltrans.cpp

src/snap-preferences.h

src/sp-guide.cpp

src/sp-namedview.cpp

src/sp-namedview.h

src/sp-text.cpp

src/spiral-context.cpp

src/star-context.cpp

src/style.cpp

src/svg/svg-length.cpp

src/text-context.cpp

src/text-editing.cpp

src/ui/CMakeLists.txt

src/ui/clipboard.cpp

src/ui/dialog/clonetiler.cpp

src/ui/dialog/clonetiler.h

src/ui/dialog/document-properties.cpp

src/ui/dialog/export.cpp

src/ui/dialog/export.h

src/ui/dialog/guides.cpp

src/ui/dialog/inkscape-preferences.cpp

src/ui/dialog/print.cpp

src/ui/dialog/text-edit.cpp

src/ui/tool/node.cpp

src/ui/widget/Makefile_insert

src/ui/widget/page-sizer.cpp

src/ui/widget/page-sizer.h

src/ui/widget/registered-widget.cpp

src/ui/widget/registered-widget.h

src/ui/widget/rendering-options.cpp

src/ui/widget/scalar-unit.cpp

src/ui/widget/selected-style.cpp

src/ui/widget/selected-style.h

src/ui/widget/style-swatch.cpp

src/ui/widget/style-swatch.h

src/ui/widget/unit-menu.cpp

src/ui/widget/unit-menu.h

src/util/expression-evaluator.cpp

src/util/units.cpp

src/util/units.h

src/widgets/arc-toolbar.cpp

src/widgets/box3d-toolbar.cpp

src/widgets/calligraphy-toolbar.cpp

src/widgets/connector-toolbar.cpp

src/widgets/desktop-widget.cpp

src/widgets/dropper-toolbar.cpp

src/widgets/eraser-toolbar.cpp

src/widgets/font-selector.cpp

src/widgets/gradient-toolbar.cpp

src/widgets/lpe-toolbar.cpp

src/widgets/measure-toolbar.cpp

src/widgets/mesh-toolbar.cpp

src/widgets/node-toolbar.cpp

src/widgets/paintbucket-toolbar.cpp

src/widgets/pencil-toolbar.cpp

src/widgets/rect-toolbar.cpp

src/widgets/ruler.cpp

src/widgets/ruler.h

src/widgets/select-toolbar.cpp

src/widgets/spiral-toolbar.cpp

src/widgets/spray-toolbar.cpp

src/widgets/spw-utilities.cpp

src/widgets/spw-utilities.h

src/widgets/star-toolbar.cpp

src/widgets/stroke-style.cpp

src/widgets/stroke-style.h

src/widgets/text-toolbar.cpp

src/widgets/toolbox.cpp

src/widgets/toolbox.h

src/widgets/tweak-toolbar.cpp

src/widgets/zoom-toolbar.cpp

Show diffs side-by-side

added added

removed removed

src/text-editing.cpp

#include "inkscape.h"

#include "message-stack.h"

#include "style.h"

#include "unit-constants.h"

#include "util/units.h"

#include "document.h"

#include "xml/repr.h"

1278

style->line_height.value = style->line_height.computed;

1279

break;

1280

case SP_CSS_UNIT_PT:

1281

style->line_height.computed += zby * PT_PER_PX;

1281

style->line_height.computed += zby * Inkscape::Util::Quantity::convert(1, "px", "pt");

1282

style->line_height.value = style->line_height.computed;

1283

break;

1284

case SP_CSS_UNIT_PC:

1285

style->line_height.computed += zby * (PT_PER_PX / 12);

1285

style->line_height.computed += zby * (Inkscape::Util::Quantity::convert(1, "px", "pt") / 12);

1286

style->line_height.value = style->line_height.computed;

1287

break;

1288

case SP_CSS_UNIT_MM:

1289

style->line_height.computed += zby * MM_PER_PX;

1289

style->line_height.computed += zby * Inkscape::Util::Quantity::convert(1, "px", "mm");

1290

style->line_height.value = style->line_height.computed;

1291

break;

1292

case SP_CSS_UNIT_CM:

1293

style->line_height.computed += zby * CM_PER_PX;

1293

style->line_height.computed += zby * Inkscape::Util::Quantity::convert(1, "px", "cm");

1294

style->line_height.value = style->line_height.computed;

1295

break;

1296

case SP_CSS_UNIT_IN:

1297

style->line_height.computed += zby * IN_PER_PX;

1297

style->line_height.computed += zby * Inkscape::Util::Quantity::convert(1, "px", "in");

1298

style->line_height.value = style->line_height.computed;

1299

break;

1300

}

Older »