diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/desktop.cpp | 8 | ||||
| -rw-r--r-- | src/desktop.h | 18 | ||||
| -rw-r--r-- | src/live_effects/lpe-bool.cpp | 8 | ||||
| -rw-r--r-- | src/ui/desktop/menubar.cpp | 5 |
4 files changed, 19 insertions, 20 deletions
diff --git a/src/desktop.cpp b/src/desktop.cpp index 2e7371ff1..a8533ee3b 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -542,7 +542,8 @@ void SPDesktop::_setDisplayColorMode(Inkscape::ColorMode mode) { _widget->setTitle( this->getDocument()->getDocumentName() ); } -bool SPDesktop::displayModeToggle() { +bool SPDesktop::displayModeToggle() +{ Inkscape::Verb *verb = Inkscape::Verb::get(SP_VERB_VIEW_MODE_NORMAL); switch (_display_mode) { case Inkscape::RENDERMODE_NORMAL: @@ -558,7 +559,7 @@ bool SPDesktop::displayModeToggle() { if (verb) { _menu_update.emit(verb->get_code(), setDisplayModeOutline()); } - + break; case Inkscape::RENDERMODE_OUTLINE: _setDisplayMode(Inkscape::RENDERMODE_VISIBLE_HAIRLINES); @@ -584,7 +585,8 @@ bool SPDesktop::displayModeToggle() { } return true; } -bool SPDesktop::displayColorModeToggle() { +bool SPDesktop::displayColorModeToggle() +{ Inkscape::Verb *verb = Inkscape::Verb::get(SP_VERB_VIEW_COLOR_MODE_NORMAL); switch (_display_color_mode) { case Inkscape::COLORMODE_NORMAL: diff --git a/src/desktop.h b/src/desktop.h index a84ceec3c..bc26a61d1 100644 --- a/src/desktop.h +++ b/src/desktop.h @@ -267,19 +267,23 @@ public: void redrawDesktop(); void _setDisplayMode(Inkscape::RenderMode mode); - bool setDisplayModeNormal() { + bool setDisplayModeNormal() + { _setDisplayMode(Inkscape::RENDERMODE_NORMAL); return true; } - bool setDisplayModeNoFilters() { + bool setDisplayModeNoFilters() + { _setDisplayMode(Inkscape::RENDERMODE_NO_FILTERS); return true; } - bool setDisplayModeOutline() { + bool setDisplayModeOutline() + { _setDisplayMode(Inkscape::RENDERMODE_OUTLINE); return true; } - bool setDisplayModeVisibleHairlines() { + bool setDisplayModeVisibleHairlines() + { _setDisplayMode(Inkscape::RENDERMODE_VISIBLE_HAIRLINES); return true; } @@ -288,11 +292,13 @@ public: Inkscape::RenderMode getMode() const { return _display_mode; } void _setDisplayColorMode(Inkscape::ColorMode mode); - bool setDisplayColorModeNormal() { + bool setDisplayColorModeNormal() + { _setDisplayColorMode(Inkscape::COLORMODE_NORMAL); return true; } - bool setDisplayColorModeGrayscale() { + bool setDisplayColorModeGrayscale() + { _setDisplayColorMode(Inkscape::COLORMODE_GRAYSCALE); return true; } diff --git a/src/live_effects/lpe-bool.cpp b/src/live_effects/lpe-bool.cpp index 2d9f491c6..68d95b8e8 100644 --- a/src/live_effects/lpe-bool.cpp +++ b/src/live_effects/lpe-bool.cpp @@ -373,15 +373,7 @@ void LPEBool::doEffect(SPCurve *curve) operand->setHidden(false); } bool_op_ex op = bool_operation.get_value(); -<<<<<<< Updated upstream -<<<<<<< HEAD bool swap = !(swap_operands.get_value()); -======= - bool swap = !swap_operands.get_value(); ->>>>>>> Fix operands in LPE bool -======= - bool swap = !(swap_operands.get_value()); ->>>>>>> Stashed changes // operand->set_transform(i2anc_affine(sp_lpe_item, sp_lpe_item->parent)); Geom::Affine current = sp_item_transform_repr(sp_lpe_item); diff --git a/src/ui/desktop/menubar.cpp b/src/ui/desktop/menubar.cpp index bab5ff8c9..c222ff7b9 100644 --- a/src/ui/desktop/menubar.cpp +++ b/src/ui/desktop/menubar.cpp @@ -454,9 +454,8 @@ build_menu(Gtk::MenuShell* menu, Inkscape::XML::Node* xml, Inkscape::UI::View::V SPAction* action = verb->get_action(Inkscape::ActionContext(view)); - if (menu_ptr->attribute("check") != nullptr) - { - Gtk::MenuItem* menuitem = build_menu_check_item_from_verb(action); + if (menu_ptr->attribute("check") != nullptr) { + Gtk::MenuItem *menuitem = build_menu_check_item_from_verb(action); if (menuitem) { std::pair<std::pair<unsigned int, Gtk::MenuItem *>, Inkscape::UI::View::View *> verbmenuitem = std::make_pair(std::make_pair(verb->get_code(), menuitem), view); |