commit 82c28fe1459693aa6d991eacea33662dd25dd405
Author: Jean-Marc Lasgouttes <[email protected]>
Date: Wed Jul 2 11:14:44 2025 +0200
move methods around to group them
---
src/insets/InsetPreview.cpp | 56 ++++++++++++++++++++++-----------------------
src/insets/InsetPreview.h | 15 ++++++------
2 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/src/insets/InsetPreview.cpp b/src/insets/InsetPreview.cpp
index 0af51d408c..c503b18b34 100644
--- a/src/insets/InsetPreview.cpp
+++ b/src/insets/InsetPreview.cpp
@@ -70,13 +70,6 @@ void InsetPreview::write(ostream & os) const
}
-void InsetPreview::addPreview(DocIterator const & inset_pos,
- graphics::PreviewLoader &) const
-{
- preparePreview(inset_pos);
-}
-
-
MacroNameSet gatherMacroDefinitions(const Buffer* buffer, const Inset * inset)
{
// Collect macros for this inset.
@@ -121,6 +114,13 @@ docstring insetToLaTeXSnippet(const Buffer* buffer, const
Inset * inset)
}
+void InsetPreview::addPreview(DocIterator const & inset_pos,
+ graphics::PreviewLoader &) const
+{
+ preparePreview(inset_pos);
+}
+
+
void InsetPreview::preparePreview(DocIterator const & pos) const
{
docstring const snippet = insetToLaTeXSnippet(pos.buffer(), this);
@@ -146,6 +146,27 @@ void InsetPreview::reloadPreview(DocIterator const & pos)
const
}
+void InsetPreview::metrics(MetricsInfo & mi, Dimension & dim) const
+{
+ if (previewState(mi.base.bv)) {
+ preview_->metrics(mi, dim);
+
+ dim.wid = max(dim.wid, 4);
+ dim.asc = max(dim.asc, 4);
+
+ dim.asc += topOffset(mi.base.bv);
+ dim.des += bottomOffset(mi.base.bv);
+ // insert a one pixel gap
+ dim.wid += 1;
+ Dimension dim_dummy;
+ MetricsInfo mi_dummy = mi;
+ InsetText::metrics(mi_dummy, dim_dummy);
+ return;
+ }
+ InsetText::metrics(mi, dim);
+}
+
+
void InsetPreview::draw(PainterInfo & pi, int x, int y) const
{
if (previewState(pi.base.bv)) {
@@ -183,27 +204,6 @@ Inset * InsetPreview::editXY(Cursor & cur, int x, int y)
}
-void InsetPreview::metrics(MetricsInfo & mi, Dimension & dim) const
-{
- if (previewState(mi.base.bv)) {
- preview_->metrics(mi, dim);
-
- dim.wid = max(dim.wid, 4);
- dim.asc = max(dim.asc, 4);
-
- dim.asc += topOffset(mi.base.bv);
- dim.des += bottomOffset(mi.base.bv);
- // insert a one pixel gap
- dim.wid += 1;
- Dimension dim_dummy;
- MetricsInfo mi_dummy = mi;
- InsetText::metrics(mi_dummy, dim_dummy);
- return;
- }
- InsetText::metrics(mi, dim);
-}
-
-
bool InsetPreview::notifyCursorLeaves(Cursor const & old, Cursor & cur)
{
reloadPreview(old);
diff --git a/src/insets/InsetPreview.h b/src/insets/InsetPreview.h
index 518e3718d7..8b6a79bee8 100644
--- a/src/insets/InsetPreview.h
+++ b/src/insets/InsetPreview.h
@@ -51,25 +51,26 @@ public:
bool descendable(BufferView const & /*bv*/) const override { return
true; }
+ bool canPaintChange(BufferView const &) const override { return true; }
+
std::string contextMenuName() const override
{ return "context-preview"; }
- void metrics(MetricsInfo & mi, Dimension & dim) const override;
+ void addPreview(DocIterator const & inset_pos,
+ graphics::PreviewLoader & ploader) const override;
- Inset * editXY(Cursor & cur, int x, int y) override;
+ void metrics(MetricsInfo & mi, Dimension & dim) const override;
void draw(PainterInfo & pi, int x, int y) const override;
- void addPreview(DocIterator const & inset_pos,
- graphics::PreviewLoader & ploader) const override;
+ void edit(Cursor & cur, bool front, EntryDirection entry_from) override;
+
+ Inset * editXY(Cursor & cur, int x, int y) override;
bool notifyCursorLeaves(Cursor const & old, Cursor & cur) override;
void write(std::ostream & os) const override;
- void edit(Cursor & cur, bool front, EntryDirection entry_from) override;
-
- bool canPaintChange(BufferView const &) const override { return true; }
//@}
protected:
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs