From: Jean-Marc Lasgouttes Date: Wed, 3 Feb 2016 09:42:01 +0000 (+0100) Subject: whitespace only X-Git-Tag: 2.3.0alpha1~1654 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f23a8fed80ccf92f1da1eaab32ca1bec0742bced;p=features.git whitespace only --- diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp index f94d7fdb45..c4ca450c4a 100644 --- a/src/insets/InsetCollapsable.cpp +++ b/src/insets/InsetCollapsable.cpp @@ -316,11 +316,11 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const const int xx1 = x + TEXT_TO_INSET_OFFSET - 1; const int xx2 = x + textdim.wid - TEXT_TO_INSET_OFFSET + 1; - pi.pain.line(xx1, y + desc - 4, - xx1, y + desc, + pi.pain.line(xx1, y + desc - 4, + xx1, y + desc, Color_foreground); if (status_ == Open) - pi.pain.line(xx1, y + desc, + pi.pain.line(xx1, y + desc, xx2, y + desc, Color_foreground); else { @@ -332,7 +332,7 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const xx2, y + desc, Color_foreground); } - pi.pain.line(x + textdim.wid - 3, y + desc, x + textdim.wid - 3, + pi.pain.line(x + textdim.wid - 3, y + desc, x + textdim.wid - 3, y + desc - 4, Color_foreground); // the label below the text. Can be toggled. @@ -454,8 +454,8 @@ Inset * InsetCollapsable::editXY(Cursor & cur, int x, int y) { //lyxerr << "InsetCollapsable: edit xy" << endl; if (geometry(cur.bv()) == ButtonOnly - || (button_dim.contains(x, y) - && geometry(cur.bv()) != NoButton)) + || (button_dim.contains(x, y) + && geometry(cur.bv()) != NoButton)) return this; cur.push(*this); return InsetText::editXY(cur, x, y); @@ -508,7 +508,7 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd) if (geometry(cur.bv()) != ButtonOnly) InsetText::doDispatch(cur, cmd); else - cur.undispatched(); + cur.undispatched(); break; } if (cmd.button() != mouse_button::button1) { @@ -586,7 +586,7 @@ void InsetCollapsable::setLabel(docstring const & l) docstring const InsetCollapsable::buttonLabel(BufferView const & bv) const { InsetLayout const & il = getLayout(); - docstring const label = labelstring_.empty() ? + docstring const label = labelstring_.empty() ? translateIfPossible(il.labelstring()) : labelstring_; if (!il.contentaslabel() || geometry(bv) != ButtonOnly) return label; diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h index f24beb5f82..e231ca0e9f 100644 --- a/src/insets/InsetCollapsable.h +++ b/src/insets/InsetCollapsable.h @@ -79,7 +79,7 @@ public: /// virtual docstring const buttonLabel(BufferView const &) const; /// - bool isOpen(BufferView const & bv) const + bool isOpen(BufferView const & bv) const { return geometry(bv) != ButtonOnly; } /// enum CollapseStatus { @@ -90,7 +90,7 @@ public: virtual void setStatus(Cursor & cur, CollapseStatus st); /// CollapseStatus status(BufferView const & bv) const; - /** Of the old CollapseStatus we only keep the values + /** Of the old CollapseStatus we only keep the values * Open and Collapsed. * We define a list of possible inset decoration * styles, and a list of possible (concrete, visual) @@ -152,7 +152,7 @@ protected: /// void doDispatch(Cursor & cur, FuncRequest & cmd); /// - void edit(Cursor & cur, bool front, + void edit(Cursor & cur, bool front, EntryDirection entry_from = ENTRY_DIRECTION_IGNORE); /// Inset * editXY(Cursor & cur, int x, int y);