#include "InsetLayout.h"
#include "Lexer.h"
#include "MetricsInfo.h"
-#include "OutputParams.h"
#include "TextClass.h"
#include "TocBackend.h"
#include "support/debug.h"
#include "support/docstream.h"
+#include "support/FileName.h"
#include "support/gettext.h"
#include "support/lassert.h"
#include "support/lstrings.h"
-#include "support/RefChanger.h"
+#include "support/Changer.h"
#include "support/TempFile.h"
using namespace std;
InsetCollapsible::CollapseStatus InsetCollapsible::status(BufferView const & bv) const
{
- if (decoration() == InsetLayout::CONGLOMERATE)
+ if (decoration() == InsetDecoration::CONGLOMERATE)
return status_;
return view_[&bv].auto_open_ ? Open : status_;
}
InsetCollapsible::Geometry InsetCollapsible::geometry(BufferView const & bv) const
{
switch (decoration()) {
- case InsetLayout::CLASSIC:
+ case InsetDecoration::CLASSIC:
if (status(bv) == Open)
return view_[&bv].openinlined_ ? LeftButton : TopButton;
return ButtonOnly;
- case InsetLayout::MINIMALISTIC:
- return status(bv) == Open ? NoButton : ButtonOnly ;
+ case InsetDecoration::MINIMALISTIC: {
+ return status(bv) == Open ?
+ (tempfile_ ? LeftButton : NoButton)
+ : ButtonOnly;
+ }
- case InsetLayout::CONGLOMERATE:
+ case InsetDecoration::CONGLOMERATE:
return status(bv) == Open ? SubLabel : Corners ;
- case InsetLayout::DEFAULT:
+ case InsetDecoration::DEFAULT:
break; // this shouldn't happen
}
setButtonLabel();
}
+int InsetCollapsible::topOffset(BufferView const * bv) const
+{
+ switch (geometry(*bv)) {
+ case Corners:
+ case SubLabel:
+ return 0;
+ default:
+ return InsetText::topOffset(bv);
+ }
+}
+
+int InsetCollapsible::bottomOffset(BufferView const * bv) const
+{
+ switch (geometry(*bv)) {
+ case Corners:
+ case SubLabel:
+ return InsetText::bottomOffset(bv) / 4;
+ default:
+ return InsetText::bottomOffset(bv);
+ }
+}
+
Dimension InsetCollapsible::dimensionCollapsed(BufferView const & bv) const
{
Dimension dim;
FontInfo labelfont(getLabelfont());
labelfont.realize(sane_font);
+ int const offset = Inset::textOffset(&bv);
theFontMetrics(labelfont).buttonText(
- buttonLabel(bv), TEXT_TO_INSET_OFFSET, dim.wid, dim.asc, dim.des);
+ buttonLabel(bv), offset, dim.wid, dim.asc, dim.des);
+ // remove spacing on the right for left buttons; we also do it for
+ // TopButton (although it is not useful per se), because
+ // openinlined_ is not always set properly at this point.
+ Geometry const geom = geometry(bv);
+ if (geom == LeftButton || geom == TopButton)
+ // this form makes a difference if offset is even
+ dim.wid -= offset - offset / 2;
return dim;
}
{
view_[mi.base.bv].auto_open_ = mi.base.bv->cursor().isInside(this);
- FontInfo tmpfont = mi.base.font;
- mi.base.font = getFont();
- mi.base.font.realize(tmpfont);
-
BufferView const & bv = *mi.base.bv;
switch (geometry(bv)) {
break;
case Corners:
InsetText::metrics(mi, dim);
- dim.des -= 3;
- dim.asc -= 1;
break;
case SubLabel: {
InsetText::metrics(mi, dim);
int d = 0;
theFontMetrics(font).rectText(buttonLabel(bv), w, a, d);
dim.des += a + d;
+ dim.wid = max(dim.wid, w);
break;
}
case TopButton:
InsetText::metrics(mi, textdim);
view_[&bv].openinlined_ = (textdim.wid + dim.wid) < mi.base.textwidth;
if (view_[&bv].openinlined_) {
- // Correct for button width.
- dim.wid += textdim.wid;
+ // Correct for button width but remove spacing before frame
+ dim.wid += textdim.wid - leftOffset(mi.base.bv) / 2;
dim.des = max(dim.des - textdim.asc + dim.asc, textdim.des);
dim.asc = textdim.asc;
} else {
- dim.des += textdim.height() + TEXT_TO_INSET_OFFSET;
+ dim.des += textdim.height() + topOffset(mi.base.bv);
dim.wid = max(dim.wid, textdim.wid);
}
}
break;
}
-
- mi.base.font = tmpfont;
}
}
+ColorCode InsetCollapsible::backgroundColor(PainterInfo const &) const
+{
+ return getLayout().bgcolor();
+}
+
+
+ColorCode InsetCollapsible::labelColor() const
+{
+ return getLayout().labelfont().color();
+}
+
+
void InsetCollapsible::draw(PainterInfo & pi, int x, int y) const
{
BufferView const & bv = *pi.base.bv;
labelfont.realize(pi.base.font);
pi.pain.buttonText(x, y, buttonLabel(bv), labelfont,
view_[&bv].mouse_hover_ ? Color_buttonhoverbg : Color_buttonbg,
- Color_buttonframe, TEXT_TO_INSET_OFFSET);
+ Color_buttonframe, Inset::textOffset(pi.base.bv));
// Draw the change tracking cue on the label, unless RowPainter already
// takes care of it.
if (canPaintChange(bv))
- pi.change_.paintCue(pi, x, y, x + dimc.width(), labelfont);
+ pi.change.paintCue(pi, x, y, x + dimc.width(), labelfont);
} else {
view_[&bv].button_dim_.x1 = 0;
view_[&bv].button_dim_.y1 = 0;
case LeftButton:
case TopButton: {
if (g == LeftButton) {
- textx = x + dimc.width();
+ // correct for spacing added before the frame in
+ // InsetText::draw. We want the button to touch the frame.
+ textx = x + dimc.width() - leftOffset(pi.base.bv) / 2;
texty = baseline;
} else {
textx = x;
}
// Do not draw the cue for INSERTED -- it is already in the button and
// that's enough.
- Changer cdummy = (pi.change_.type == Change::INSERTED)
- ? make_change(pi.change_, Change())
- : Changer();
+ Changer cdummy = (pi.change.type == Change::INSERTED)
+ ? changeVar(pi.change, Change())
+ : noChange();
InsetText::draw(pi, textx, texty);
break;
}
// We will take care of the frame and the change tracking cue
// ourselves, below.
{
- Changer cdummy = make_change(pi.change_, Change());
+ Changer cdummy = changeVar(pi.change, Change());
const_cast<InsetCollapsible *>(this)->setDrawFrame(false);
InsetText::draw(pi, textx, texty);
const_cast<InsetCollapsible *>(this)->setDrawFrame(true);
}
int desc = textdim.descent();
- if (g == Corners)
- desc -= 3;
// Colour the frame according to the change type. (Like for tables.)
- Color colour = pi.change_.changed() ? pi.change_.color()
+ Color colour = pi.change.changed() ? pi.change.color()
: Color_foreground;
- const int xx1 = x + TEXT_TO_INSET_OFFSET - 1;
- const int xx2 = x + textdim.wid - TEXT_TO_INSET_OFFSET + 1;
+ const int xx1 = x + leftOffset(pi.base.bv) - 1;
+ const int xx2 = x + textdim.wid - rightOffset(pi.base.bv) + 1;
pi.pain.line(xx1, y + desc - 4,
xx1, y + desc, colour);
if (status_ == Open)
// the label below the text. Can be toggled.
if (g == SubLabel) {
FontInfo font(getLabelfont());
- if (pi.change_.changed())
+ if (pi.change.changed())
font.setPaintColor(colour);
font.realize(sane_font);
font.decSize();
int w = 0;
int a = 0;
int d = 0;
- Color const col = pi.full_repaint ? Color_none : pi.backgroundColor(this);
+ Color const col = pi.full_repaint ? Color_none : pi.backgroundColor();
theFontMetrics(font).rectText(buttonLabel(bv), w, a, d);
int const ww = max(textdim.wid, w);
pi.pain.rectText(x + (ww - w) / 2, y + desc + a,
}
// Strike through the inset if deleted and not already handled by
// RowPainter.
- if (pi.change_.deleted() && canPaintChange(bv))
- pi.change_.paintCue(pi, xx1, y1, xx2, y + desc);
+ if (pi.change.deleted() && canPaintChange(bv))
+ pi.change.paintCue(pi, xx1, y1, xx2, y + desc);
break;
}
}
switch (geometry(bv)) {
case LeftButton:
- x += dimensionCollapsed(bv).wid;
+ x += dimensionCollapsed(bv).wid - leftOffset(&bv) / 2;
break;
case TopButton: {
y += dimensionCollapsed(bv).des + textdim.asc;
return false;
switch (decoration()) {
- case InsetLayout::CLASSIC:
- case InsetLayout::MINIMALISTIC:
+ case InsetDecoration::CLASSIC:
+ case InsetDecoration::MINIMALISTIC:
return status_ == Open;
default:
return true;
pos_type const n = min(max_length, p_siz);
pos_type i = 0;
pos_type j = 0;
- bool changed_content = false;
for (; i < n && j < p_siz; ++j) {
- if (paragraphs().begin()->isChanged(j)) {
- changed_content = true;
- if (paragraphs().begin()->isDeleted(j))
- continue;
- }
+ if (paragraphs().begin()->isDeleted(j))
+ continue;
if (paragraphs().begin()->isInset(j)) {
if (!paragraphs().begin()->getInset(j)->isChar())
continue;
if (paragraphs().size() > 1 || (i > 0 && j < p_siz)) {
label << "...";
}
- docstring lbl;
- // indicate changed content in label (#8645)
- if (changed_content)
- lbl = char_type(0x270E);// ✎ U+270E LOWER RIGHT PENCIL
- lbl += label.str();
- return lbl.empty() ? l : lbl;
+ return label.str().empty() ? l : label.str();
}
return true;
case LFUN_INSET_EDIT:
- flag.setEnabled(getLayout().editExternally() && tempfile_ == 0);
+ flag.setEnabled(!buffer().hasReadonlyFlag() &&
+ getLayout().editExternally() && tempfile_ == nullptr);
return true;
case LFUN_INSET_END_EDIT:
- flag.setEnabled(getLayout().editExternally() && tempfile_ != 0);
+ flag.setEnabled(!buffer().hasReadonlyFlag() &&
+ getLayout().editExternally() && tempfile_ != nullptr);
return true;
default:
docstring const InsetCollapsible::buttonLabel(BufferView const & bv) const
{
+ // U+1F512 LOCK
+ docstring const locked = tempfile_ ? docstring(1, 0x1F512) : docstring();
+ // indicate changed content in label (#8645)
+ // ✎ U+270E LOWER RIGHT PENCIL
+ docstring const indicator = (isChanged() && geometry(bv) == ButtonOnly)
+ ? docstring(1, 0x270E) : docstring();
InsetLayout const & il = getLayout();
docstring const label = getLabel();
if (!il.contentaslabel() || geometry(bv) != ButtonOnly)
- return label;
- return getNewLabel(label);
+ return locked + indicator + label;
+ return locked + indicator + getNewLabel(label);
}
}
-InsetLayout::InsetDecoration InsetCollapsible::decoration() const
+InsetDecoration InsetCollapsible::decoration() const
{
- InsetLayout::InsetDecoration const dec = getLayout().decoration();
- return dec == InsetLayout::DEFAULT ? InsetLayout::CLASSIC : dec;
+ InsetDecoration const dec = getLayout().decoration();
+ return dec == InsetDecoration::DEFAULT ? InsetDecoration::CLASSIC : dec;
}
{
string context_menu = contextMenuName();
string const it_context_menu = InsetText::contextMenuName();
- if (decoration() == InsetLayout::CONGLOMERATE)
+ if (decoration() == InsetDecoration::CONGLOMERATE)
return context_menu + ";" + it_context_menu;
string const ic_context_menu = InsetCollapsible::contextMenuName();
string InsetCollapsible::contextMenuName() const
{
- if (decoration() == InsetLayout::CONGLOMERATE)
+ if (decoration() == InsetDecoration::CONGLOMERATE)
return "context-conglomerate";
else
return "context-collapsible";
projects / lyx.git / blobdiff