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

* InsetText:

Browse Source 
- wide_inset_ is not mutable any more
  - Wide(): split up in Wide() and setWide()

* rowpainter.C:
  - paintPar(): use a const_cast instead of the mutable InsetText::Wide()

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15779 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2006-11-07 15:21:47 +00:00
parent fc68c619ab
commit 03d9514bd7
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/insets/insettext.h
View File

@ -133,7 +133,9 @@ public:
///
InsetText(InsetText const &);
///
bool & Wide() const { return wide_inset_; }
bool Wide() const { return wide_inset_; }
///
void setWide(bool wide_inset) { wide_inset_ = wide_inset; }
protected:
///
@ -156,7 +158,7 @@ private:
///
static int border_;
///
mutable bool wide_inset_;
bool wide_inset_;
public:
///
mutable LyXText text_;

9
src/rowpainter.C
View File

@ -880,12 +880,17 @@ void paintPar
text);
// If this is the only object on the row, we can make it wide
//
// FIXME: there is a const_cast here because paintPar() is not supposed
// to touch the paragraph contents. So either we move this "wide"
// property out of InsetText or we localize the feature to the painting
// done here.
for (pos_type i = rit->pos() ; i != rit->endpos(); ++i) {
InsetBase const * const in = par.getInset(i);
if (in) {
InsetText const * const t = in->asTextInset();
InsetText * t = const_cast<InsetText *>(in->asTextInset());
if (t)
t->Wide() = in_inset_alone_on_row;
t->setWide(in_inset_alone_on_row);
}
}