Commit Graph

93 Commits

Author SHA1 Message Date
Vincent van Ravesteijn
26c5e8a83b Fix bug 5629: http://bugzilla.lyx.org/show_bug.cgi?id=5629.
Hard to distinguish between added and deleted text.

* Changes.cpp/h: add a merge_color for deletions and change the return type to Color.

* ColorCode.h/Color.cpp: add a new customizable color that indicates the merge color for deletion.

See: 
http://thread.gmane.org/gmane.editors.lyx.devel/114189 


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28423 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-09 20:47:32 +00:00
Vincent van Ravesteijn
438aaf2ec9 Add a new member to FontInfo denoting the color to be used when painting.
* rowpainter.cpp: now the color for painting selected text and changed text is set via FontInfo::setColor. However, this color should remain a ColorCode as this color is used in e.g. the GuiCharacter dialog and for LateX output. Therefore I use now the FontInfo::setPaintColor function.

* FontInfo.cpp/h: new members paint_color_ and setPaintColor(). The function realColor is updated to return the paintColor when it is set.

See:
http://thread.gmane.org/gmane.editors.lyx.devel/114189

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28422 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-09 20:22:48 +00:00
Vincent van Ravesteijn
814a8411eb Reverse unwanted commits.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28388 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-08 01:11:27 +00:00
Vincent van Ravesteijn
f694cf7135 * InsetMathNest.cpp: Cosmetics.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28387 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-08 01:01:15 +00:00
Georg Baum
07676f2330 fix metrics debugging
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27955 a592a061-630c-0410-9148-cb99ea01b6c8
2008-12-22 18:16:05 +00:00
Pavel Sanda
e4808961c9 Another selection painting patch, PainterInfo::backgroundColor introduced.
Patch by Vincent.

http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg145438.html



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27097 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-25 10:47:38 +00:00
Uwe Stöhr
7382c55fd7 add support for TABs in Listings, fileformat change, fixes http://bugzilla.lyx.org/show_bug.cgi?id=3629 , patch by Vincent, lyx2lyx and UI stuff by me
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26647 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-30 18:00:02 +00:00
Pavel Sanda
f7cf8c09d2 git is shouting at me because of whitespaces, so what can i do...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26498 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-22 15:41:05 +00:00
Pavel Sanda
29e02eff76 Colors for multi-author track changes.
Patch by Vincent.

http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg143215.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26497 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-22 15:30:26 +00:00
André Pönitz
3a5e4ab8ca more appropriate behaviour on assert
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26233 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-24 21:24:21 +00:00
Abdelrazak Younes
0b86ea9f71 previous rev: revert accidental commit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25932 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-28 15:05:12 +00:00
Abdelrazak Younes
2d9def6577 Fix http://bugzilla.lyx.org/show_bug.cgi?id=5021
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25931 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-28 14:58:29 +00:00
Dov Feldstern
dba608e1d7 fix completion painting for RTL (inline completion and completion list)
see http://permalink.gmane.org/gmane.editors.lyx.devel/107923 for an 
explanation, though note that this patch is more extensive than the one
attached there


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25118 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-04 19:45:26 +00:00
Abdelrazak Younes
2b9fea2db3 Cosmetics and comments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24771 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-14 15:37:20 +00:00
Abdelrazak Younes
fb8914b9ca cosmetics.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24770 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-14 15:24:36 +00:00
Abdelrazak Younes
ffc1002291 simplify selected text painting.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24769 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-14 15:16:10 +00:00
Abdelrazak Younes
45bc27809b remove unneeded includes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24628 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-06 06:48:38 +00:00
Jean-Marc Lasgouttes
9b4a26a252 rename assert.h to lassert.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24559 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-30 08:26:40 +00:00
André Pönitz
7f461f4392 infrastructure for 'graceful asserts'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24216 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-10 21:49:34 +00:00
Edwin Leuven
fdaf744c4a implement separate color for text in selection
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24033 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-29 11:21:36 +00:00
André Pönitz
6b28f08ff2 cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23891 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-21 21:47:37 +00:00
Uwe Stöhr
b1e077a7d2 compilation fixes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23797 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-17 21:11:17 +00:00
André Pönitz
f2c9b56fb4 cosmetics/#include cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23747 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-15 00:22:54 +00:00
Richard Heck
a01cb111a0 Change the interface to a paragraph's layout. We still store a LayoutPtr, but now privately, and make a Layout const & available to clients.
The need for a LayoutPtr arises from the fact that (a) we do not want to give our clients a Layout &, since we do not want them to be able to change our Layout; but (b) we also need to be able to change which layout is ours. So we cannot store a Layout const &. Or so it seems to the compiler.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23522 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-06 21:31:27 +00:00
Stefan Schimanski
0cdf6c006b * corner cases for RTL completions: RTL<->LTR boundaries
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23318 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-28 12:44:42 +00:00
Stefan Schimanski
f7cd0928ad * correct color for the unique part of the completion in RTL
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23315 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-28 12:42:58 +00:00
André Pönitz
1cca0a86bd API cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23295 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-27 23:03:26 +00:00
Abdelrazak Younes
f658224e5c Fix warnings and svn eol properties.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23220 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 08:54:51 +00:00
André Pönitz
0fb8f3fba1 mostly s/Paragraph::layout(...)/Paragraph::setLayout(...)/
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23159 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-23 16:45:38 +00:00
Stefan Schimanski
37b79f1039 * allow on position more at the row end for the completion
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23148 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-22 23:40:36 +00:00
Stefan Schimanski
3cdfa1708f * the bidi array drives me crazy. It only holds the current row. So better check that our position is in that row.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23145 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-22 21:57:45 +00:00
Stefan Schimanski
0d7ca9cdc3 * inlineCompletionVPos is only used locally. So define it there.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23144 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-22 21:57:33 +00:00
Stefan Schimanski
f614d46ca1 * cosmetic
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23132 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-22 15:26:52 +00:00
Stefan Schimanski
7b0ea48d31 * first step to proper RTL support of the completion. The cursor is still wrong.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23130 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-22 14:05:27 +00:00
Stefan Schimanski
1bf7b59d60 * completion infrastructure
* completion support for mathed
* experimental completion support for text


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23104 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-21 19:42:34 +00:00
Abdelrazak Younes
2bf1c09376 header cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23049 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-18 07:14:42 +00:00
André Pönitz
225bf49cf9 some refactoring.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22890 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-09 10:41:49 +00:00
Abdelrazak Younes
091ff73403 RowPainter::paintLast(): microptimisation and comments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22705 a592a061-630c-0410-9148-cb99ea01b6c8
2008-01-29 07:31:24 +00:00
Abdelrazak Younes
c9273f13e8 Adjustment to the end box drawing at the end of a proof layout environment (Theorem AMS). Ideas taken from Richard and JMarc.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22702 a592a061-630c-0410-9148-cb99ea01b6c8
2008-01-28 21:22:29 +00:00
Abdelrazak Younes
f643441cf2 Better fix than revision 22553. Transfer the backup to RowPainter::paintInset().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22554 a592a061-630c-0410-9148-cb99ea01b6c8
2008-01-14 16:24:01 +00:00
Abdelrazak Younes
9abb7db468 getting rid of superfluous std:: statements.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22104 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 19:28:07 +00:00
Abdelrazak Younes
9383f4c3c6 'using namespace std' instead of 'using std::xxx'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22097 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 10:16:00 +00:00
Abdelrazak Younes
55a9524e99 Cleanup Hfill metrics and painting. InsetHFill is now treated almost like any other inset.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21980 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-05 22:25:07 +00:00
André Pönitz
9d0ea8aeff Move debug.{cpp,h}, Messages.{cpp,h} and gettext.{cpp,h} to support/.
Now support/* should have no dependencies on src/* anymore.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21851 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-29 07:04:28 +00:00
André Pönitz
150cf11651 hand-crafted LyXErr
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21849 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-28 22:12:03 +00:00
Abdelrazak Younes
c201e0dde7 Fix crash with InsetHFill. The inset position was not cached in the CoordCache.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21758 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-24 07:47:01 +00:00
Abdelrazak Younes
cff2f03285 RowPainter::paintForeignMark(): take a Language instead of a Font.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21253 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-29 08:52:13 +00:00
Abdelrazak Younes
d58f8cf7f6 Add some const and avoid implicit constructions.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21252 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-29 08:47:19 +00:00
Abdelrazak Younes
d6f380eac1 Undo some Font -> FontInfo moves.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21248 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-28 22:49:49 +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