anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-14 06:57:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
15,124 Commits 31 Branches 172 Tags 617 MiB
c5f981f34c
Commit Graph

79 Commits

Author SHA1 Message Date
Abdelrazak Younes
c51f1cffaa * InsetCollapsable: 
- InsetCollapsable(): Move labelfont initialisation to InsetCollapsable::setLayout().
- read(): reset the inset layout.

All other insets: get rid of redundant setLayout() calls.

This commit fixes the multiple crashes in trunk but the color used for text and background are completely wrong...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21382 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-11-02 17:47:51 +00:00
Abdelrazak Younes
b931f6ab4a Properly initialize label font. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21378 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-11-02 16:34:37 +00:00
Martin Vermeer
1d894fd5e3 Fix inset font inheritance mechanism; smaller clean-ups 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21315 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-11-01 06:25:47 +00:00
Martin Vermeer
ae76ba2362 LFUN_LANGUAGE enabled wrong way around 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21308 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-31 08:54:44 +00:00
Martin Vermeer
abf5d0c1c3 Fix thinko: we need to apply the default font here, not the inset's font commands 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21294 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-30 16:24:52 +00:00
Martin Vermeer
3d443b4c9d Implement ForceLtR; cleanup of collapsable insets 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21285 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-30 12:30:46 +00:00
Abdelrazak Younes
5e418fb660 put back the const. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21257 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-29 10:47:41 +00:00
Abdelrazak Younes
c3452835a8 * MetricsInfo::background_color: int -> ColorCode 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21255 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-29 10:36:20 +00:00
Abdelrazak Younes
5ddc612b73 Splitup Font in saner bits: 
* Font::FontBits -> FontInfo
* Font::FONT_XXX -> all enums transfered to FontEnums.h and renamed to FontXxx

I've replaced Font uses with FontInfo were the language() member was not needed, basically all draw() and metrics methods. There's one problematic cases with InsetQuotes which I solved by taking the Buffer main language.




git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21240 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-28 18:51:54 +00:00
Abdelrazak Younes
eea79637c7 Move Color::color enum to ColorCode.h 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21198 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-25 12:41:02 +00:00
Martin Vermeer
1f07a7f929 Introduce inset parameters keepempty, freespacing, needprotect and rename verbatim->passthru 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21197 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-25 09:19:26 +00:00
Martin Vermeer
9e6aa60d0f Move disabling LFUNS from ERT to Collapsable 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21178 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-24 11:30:47 +00:00
Martin Vermeer
ccacb487f2 Verbatim for URL inset, \protect for special phrases (index inset) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21083 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-20 17:05:28 +00:00
Martin Vermeer
04ee2d87fc Introduce allowMultiPar() 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20898 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-11 10:13:45 +00:00
Martin Vermeer
9585df177e Get Conglomerate-style rendering back into order 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20769 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-06 08:15:40 +00:00
Abdelrazak Younes
82d3607f05 Hopefully fix 'Corners' and 'SubLabel' insets drawing. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20479 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-25 06:49:04 +00:00
Abdelrazak Younes
237c132c1e * Inset: 
- get rid of the cached Dimension. Text inset dimensions are saved in ParagraphMetrics and mathed maintain their own dimension where needed.
- width(), ascent(), descent(): deleted.
- dimension(): now needs a valid BufferView.
- metrics(): now void.

* BufferView::getCoveringInset(): simplify.

* ParagraphMetrics(): now cache inset dimensions.




git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20420 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-21 20:39:47 +00:00
Martin Vermeer
417c25c91b Robustify this 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20379 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-20 14:11:37 +00:00
Martin Vermeer
4cc0355468 Polish 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20354 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-18 20:48:39 +00:00
Martin Vermeer
dc23701244 Pick up some stitches dropped by Abdel ;-) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20353 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-18 20:18:50 +00:00
Abdelrazak Younes
516ff470d8 Fix InsetBox drawing and remove remnant of the wide() hack. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20334 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-18 08:52:38 +00:00
Abdelrazak Younes
745d9ac46e * InsetCollapsable::draw(): replace use of dim_ with InsetText::dimension(). 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20331 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-17 22:18:07 +00:00
Abdelrazak Younes
2dc0945bda remove InsetCollapsable::drawSelection(): this was not used. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20327 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-17 21:48:25 +00:00
Abdelrazak Younes
74acf6b528 Cleanup the TEXT_TO_INSET_OFFSET mess. This correction is done now once in InsetText. Various other cleanup resulting from this change. In particular, pave the way to the removal of Dimension Inset::dim_ member by registering the inset dimension in RowPainter::paintInset() instead of InsetXXX::draw(). 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20326 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-17 21:45:14 +00:00
Lars Gullik Bjønnes
26f336769a Remove warnings reported with gcc 4.3: 
- Modifier on return type ignored
	- Ambigous else
	- Ambigous logical operators
	- Semi-colon instead of empty block
	- Missing header files
	- Missing using std::XX
	- Initialization out of order


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20304 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-16 10:36:57 +00:00
Abdelrazak Younes
c3e3534148 * TextMetrics::draw(): withdraw first row ascent before drawing because the convention is that the baseline of a multirow text is the baseline of the first row. 
All other files: adapt to above change.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20177 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-09 20:21:43 +00:00
Martin Vermeer
2ddba774ce y-coord in Conglomerate, this time properly 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20103 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-06 14:17:03 +00:00
Martin Vermeer
6089258acc Fix y co-ordinate for Conglomerate-style inset 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20102 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-06 14:06:07 +00:00
Abdelrazak Younes
ea87429a23 Nicely align inset buttons with surrounding text. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20101 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-06 12:25:30 +00:00
Abdelrazak Younes
2d8b08b63c InsetCollapsable::draw(): Rename 'top' local variable to baseline as that's what it is really. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20100 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-06 12:00:32 +00:00
Abdelrazak Younes
95e09581c5 Fix alignment of text within insets. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20083 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-05 22:08:41 +00:00
Abdelrazak Younes
d9d7af7019 Fix drawing of collapsable inset without button. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20082 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-05 21:52:12 +00:00
Martin Vermeer
12e1d4bc8d Name change CharStyle -> Flex 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20072 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-05 15:29:04 +00:00
Abdelrazak Younes
6a35e705a4 Fix cursor positioning withing collapsable insets. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20070 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-05 14:15:07 +00:00
Alfredo Braunstein
8158e25ab7 (InsetCollapsable::draw) restore background color (avoid psychedelic effects when selecting a note) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20069 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-05 13:52:43 +00:00
Abdelrazak Younes
d1813ca269 * TextMetrics::draw(): get rid of the first par ascent offset. 
* BufferView::draw(): adapt to above change.

* InsetCollapsable::draw(): ditto -> get rid of textdim_ member.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20068 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-05 13:45:58 +00:00
Abdelrazak Younes
bc6304d760 Don't save background color in Text. Hand it down at drawing time. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20002 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-02 14:34:15 +00:00
Abdelrazak Younes
7150b25b7e * InsetCollapsable::metrics(): Allow a bit more inlined size. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19993 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-02 10:35:36 +00:00
Abdelrazak Younes
452348f4ce * InsetCollapsable::metrics(): Put back the test previous to revision 14472 for openinlined_ 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19985 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-01 23:01:21 +00:00
Martin Vermeer
8906059a0a Cleanup painting of corners 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19978 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-01 20:38:25 +00:00
Martin Vermeer
e0db6e2679 small cleanup collapsable; label fix branch 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19976 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-01 17:55:21 +00:00
Martin Vermeer
ed6f900552 Use Minimalistic for branches 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19973 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-01 11:40:09 +00:00
Abdelrazak Younes
fb74d5a476 * InsetCollapsable::metrics(): it seems we don't need to refit anymore. Saves an InsetText::metrics() call and enable single Row painting within opened inline insets. 
* TextMetrics::drawParagraph(): force full repaint on Insets that are within the current repainting row.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19968 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-09-01 09:24:20 +00:00
Alfredo Braunstein
c94eb3deeb cosmetics 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19959 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-31 20:24:15 +00:00
Alfredo Braunstein
d44c6722f0 fix two metrics bug + remove an extra metrics call 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19954 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-31 17:32:27 +00:00
Martin Vermeer
92e8e19363 Further cleanup, decoration -> geometry, bugfix 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19944 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-31 12:05:41 +00:00
Martin Vermeer
2854410d7b Cleanup: Replace decoration() calls by geometry(). (And get rid of unused call) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19937 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-31 07:15:32 +00:00
Abdelrazak Younes
9b9168c31a Fix redrawing bug for multirow inlined collapsable inset. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19921 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-30 19:27:33 +00:00
André Pönitz
ed858d73e5 use bald pointers in clone() 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19920 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-30 18:03:17 +00:00
Abdelrazak Younes
235312c376 * InsetCollapsable::setStatus(): remove the Buffer::changed() signal emission. This causes a WorkArea redraw before the BufferView metrics update happens. 
* WorkArea::dispatch(): replace the redraw() call with a Buffer::changed() signal emission in order to update all views of the Buffer, even though some view won't need the redraw...



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19867 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-28 18:13:17 +00:00