anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 13:04:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove some spacing above InsetColapsible when possible

Browse Source
This commit is contained in:
Jean-Marc Lasgouttes 2020-01-15 11:12:47 +01:00
parent 9176e60b7b
commit eeb4187a28
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/insets/InsetCollapsible.cpp
View File

@ -157,6 +157,27 @@ void InsetCollapsible::read(Lexer & lex)
setButtonLabel(); 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:
return InsetText::topOffset(bv) / 4;
default:
return InsetText::topOffset(bv);
}
}
Dimension InsetCollapsible::dimensionCollapsed(BufferView const & bv) const Dimension InsetCollapsible::dimensionCollapsed(BufferView const & bv) const
{ {
@ -185,8 +206,6 @@ void InsetCollapsible::metrics(MetricsInfo & mi, Dimension & dim) const
break; break;
case Corners: case Corners:
InsetText::metrics(mi, dim); InsetText::metrics(mi, dim);
dim.des -= 3;
dim.asc -= 1;
break; break;
case SubLabel: { case SubLabel: {
InsetText::metrics(mi, dim); InsetText::metrics(mi, dim);
@ -319,8 +338,6 @@ void InsetCollapsible::draw(PainterInfo & pi, int x, int y) const
} }
int desc = textdim.descent(); int desc = textdim.descent();
if (g == Corners)
desc -= 3;
// Colour the frame according to the change type. (Like for tables.) // 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()

6
src/insets/InsetCollapsible.h
View File

@ -54,6 +54,12 @@ public:
void read(Lexer &); void read(Lexer &);
/// ///
void write(std::ostream &) const; void write(std::ostream &) const;
///
int topOffset(BufferView const * bv) const;
///
int bottomOffset(BufferView const * bv) const;
/// ///
void metrics(MetricsInfo &, Dimension &) const; void metrics(MetricsInfo &, Dimension &) const;
/// ///