anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 05:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix the include inset; Angus, please doublecheck this

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8928 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2004-08-14 19:20:42 +00:00
parent 498724d21b
commit ec4ebf3dcd
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/insets/ChangeLog
View File

@ -1,3 +1,12 @@
2004-08-14 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* insetinclude.C (priv_dispatch): fix showing dialog on mouse
release
(metrics): the insets is not full width any more.
(draw): adjust; fix bad test for PREVIEW_OFF
(add_preview): fix bad test for PREVIEW_OFF
(display): do not return true when using \input
2004-08-14 José Matos <jamatos@lyx.org>
* insetbibitem.[Ch] (plaintext): added.

26
src/insets/insetinclude.C
View File

@ -138,10 +138,6 @@ void InsetInclude::priv_dispatch(LCursor & cur, FuncRequest & cmd)
break;
case LFUN_MOUSE_RELEASE:
if (button_.box().contains(cmd.x, cmd.y))
InsetIncludeMailer(*this).showDialog(&cur.bv());
break;
case LFUN_INSET_DIALOG_SHOW:
InsetIncludeMailer(*this).showDialog(&cur.bv());
break;
@ -604,16 +600,14 @@ void InsetInclude::metrics(MetricsInfo & mi, Dimension & dim) const
if (!set_label_) {
set_label_ = true;
button_.update(getScreenLabel(*mi.base.bv->buffer()),
editable() != NOT_EDITABLE);
true);
}
button_.metrics(mi, dim);
}
int center_indent = type(params_) == INPUT ?
0 : (mi.base.textwidth - dim.wid) / 2;
Box b(center_indent, center_indent + dim.wid, -dim.asc, dim.des);
Box b(0, dim.wid, -dim.asc, dim.des);
button_.setBox(b);
dim.wid = mi.base.textwidth;
dim_ = dim;
}
@ -625,18 +619,24 @@ void InsetInclude::draw(PainterInfo & pi, int x, int y) const
BOOST_ASSERT(pi.base.bv && pi.base.bv->buffer());
bool use_preview = false;
if (RenderPreview::status() == LyXRC::PREVIEW_OFF) {
if (RenderPreview::status() != LyXRC::PREVIEW_OFF) {
lyx::graphics::PreviewImage const * pimage =
preview_->getPreviewImage(*pi.base.bv->buffer());
use_preview = pimage && pimage->image();
}
if (use_preview)
preview_->draw(pi, x + button_.box().x1, y);
preview_->draw(pi, x, y);
else
button_.draw(pi, x + button_.box().x1, y);
button_.draw(pi, x, y);
}
bool InsetInclude::display() const
{
return type(params_) != INPUT;
}
//
// preview stuff
@ -681,7 +681,7 @@ void add_preview(RenderMonitoredPreview & renderer, InsetInclude const & inset,
Buffer const & buffer)
{
InsetCommandParams const & params = inset.params();
if (RenderPreview::status() == LyXRC::PREVIEW_OFF &&
if (RenderPreview::status() != LyXRC::PREVIEW_OFF &&
preview_wanted(params, buffer)) {
renderer.setAbsFile(includedFilename(buffer, params));
string const snippet = latex_string(inset, buffer);

2
src/insets/insetinclude.h
View File

@ -39,7 +39,7 @@ public:
///
void draw(PainterInfo & pi, int x, int y) const;
///
virtual bool display() const { return true; }
virtual bool display() const;
/// get the parameters
InsetCommandParams const & params(void) const;