anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-13 11:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

whitespace only

Browse Source
This commit is contained in:
Jean-Marc Lasgouttes 2016-02-03 10:42:01 +01:00
parent 6ad2edc381
commit fb90076e90
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/insets/InsetCollapsable.cpp
View File

@ -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 xx1 = x + TEXT_TO_INSET_OFFSET - 1;
const int xx2 = x + textdim.wid - TEXT_TO_INSET_OFFSET + 1; const int xx2 = x + textdim.wid - TEXT_TO_INSET_OFFSET + 1;
pi.pain.line(xx1, y + desc - 4, pi.pain.line(xx1, y + desc - 4,
xx1, y + desc, xx1, y + desc,
Color_foreground); Color_foreground);
if (status_ == Open) if (status_ == Open)
pi.pain.line(xx1, y + desc, pi.pain.line(xx1, y + desc,
xx2, y + desc, xx2, y + desc,
Color_foreground); Color_foreground);
else { else {
@ -332,7 +332,7 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
xx2, y + desc, xx2, y + desc,
Color_foreground); 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); y + desc - 4, Color_foreground);
// the label below the text. Can be toggled. // 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; //lyxerr << "InsetCollapsable: edit xy" << endl;
if (geometry(cur.bv()) == ButtonOnly if (geometry(cur.bv()) == ButtonOnly
|| (button_dim.contains(x, y) || (button_dim.contains(x, y)
&& geometry(cur.bv()) != NoButton)) && geometry(cur.bv()) != NoButton))
return this; return this;
cur.push(*this); cur.push(*this);
return InsetText::editXY(cur, x, y); return InsetText::editXY(cur, x, y);
@ -508,7 +508,7 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
if (geometry(cur.bv()) != ButtonOnly) if (geometry(cur.bv()) != ButtonOnly)
InsetText::doDispatch(cur, cmd); InsetText::doDispatch(cur, cmd);
else else
cur.undispatched(); cur.undispatched();
break; break;
} }
if (cmd.button() != mouse_button::button1) { if (cmd.button() != mouse_button::button1) {
@ -586,7 +586,7 @@ void InsetCollapsable::setLabel(docstring const & l)
docstring const InsetCollapsable::buttonLabel(BufferView const & bv) const docstring const InsetCollapsable::buttonLabel(BufferView const & bv) const
{ {
InsetLayout const & il = getLayout(); InsetLayout const & il = getLayout();
docstring const label = labelstring_.empty() ? docstring const label = labelstring_.empty() ?
translateIfPossible(il.labelstring()) : labelstring_; translateIfPossible(il.labelstring()) : labelstring_;
if (!il.contentaslabel() || geometry(bv) != ButtonOnly) if (!il.contentaslabel() || geometry(bv) != ButtonOnly)
return label; return label;

6
src/insets/InsetCollapsable.h
View File

@ -79,7 +79,7 @@ public:
/// ///
virtual docstring const buttonLabel(BufferView const &) const; virtual docstring const buttonLabel(BufferView const &) const;
/// ///
bool isOpen(BufferView const & bv) const bool isOpen(BufferView const & bv) const
{ return geometry(bv) != ButtonOnly; } { return geometry(bv) != ButtonOnly; }
/// ///
enum CollapseStatus { enum CollapseStatus {
@ -90,7 +90,7 @@ public:
virtual void setStatus(Cursor & cur, CollapseStatus st); virtual void setStatus(Cursor & cur, CollapseStatus st);
/// ///
CollapseStatus status(BufferView const & bv) const; 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. * Open and Collapsed.
* We define a list of possible inset decoration * We define a list of possible inset decoration
* styles, and a list of possible (concrete, visual) * styles, and a list of possible (concrete, visual)
@ -152,7 +152,7 @@ protected:
/// ///
void doDispatch(Cursor & cur, FuncRequest & cmd); void doDispatch(Cursor & cur, FuncRequest & cmd);
/// ///
void edit(Cursor & cur, bool front, void edit(Cursor & cur, bool front,
EntryDirection entry_from = ENTRY_DIRECTION_IGNORE); EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
/// ///
Inset * editXY(Cursor & cur, int x, int y); Inset * editXY(Cursor & cur, int x, int y);