Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
4fb2dfc9
Commit
4fb2dfc9
authored
Mar 16, 2008
by
Eric Pouech
Committed by
Alexandre Julliard
Mar 17, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
richedit: Added support for end of line inside paragraphs.
parent
513fcfe4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
6 deletions
+15
-6
editstr.h
dlls/riched20/editstr.h
+8
-6
wrap.c
dlls/riched20/wrap.c
+7
-0
No files found.
dlls/riched20/editstr.h
View file @
4fb2dfc9
...
...
@@ -92,11 +92,11 @@ typedef enum {
/******************************** run flags *************************/
#define MERF_STYLEFLAGS 0x0FFF
/* run contains non-text content, which has its own rules for wrapping, sizing etc */
#define MERF_GRAPHICS 1
#define MERF_GRAPHICS
0x00
1
/* run is a tab (or, in future, any kind of content whose size is dependent on run position) */
#define MERF_TAB 2
#define MERF_TAB
0x00
2
/* run is a cell boundary */
#define MERF_CELL 4
#define MERF_CELL
0x00
4
#define MERF_NONTEXT (MERF_GRAPHICS | MERF_TAB | MERF_CELL)
...
...
@@ -114,13 +114,15 @@ typedef enum {
#define MERF_CALCBYWRAP 0x0F0000
/* the "end of paragraph" run, contains 1 character */
#define MERF_ENDPARA 0x100000
/* forcing the "end of row" run, contains 1 character */
#define MERF_ENDROW 0x200000
/* run is hidden */
#define MERF_HIDDEN 0x
2
00000
#define MERF_HIDDEN 0x
4
00000
/* runs with any of these flags set cannot be joined */
#define MERF_NOJOIN (MERF_GRAPHICS|MERF_TAB|MERF_ENDPARA)
#define MERF_NOJOIN (MERF_GRAPHICS|MERF_TAB|MERF_ENDPARA
|MERF_ENDROW
)
/* runs that don't contain real text */
#define MERF_NOTEXT (MERF_GRAPHICS|MERF_TAB|MERF_ENDPARA)
#define MERF_NOTEXT (MERF_GRAPHICS|MERF_TAB|MERF_ENDPARA
|MERF_ENDROW
)
/* those flags are kept when the row is split */
#define MERF_SPLITMASK (~(0))
...
...
dlls/riched20/wrap.c
View file @
4fb2dfc9
...
...
@@ -282,6 +282,13 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p)
ME_InsertRowStart
(
wc
,
p
);
return
p
;
}
/* simply end the current row and move on to next one */
if
(
run
->
nFlags
&
MERF_ENDROW
)
{
p
=
p
->
next
;
ME_InsertRowStart
(
wc
,
p
);
return
p
;
}
/* we're not at the end of the row */
/* will current run fit? */
if
(
wc
->
pt
.
x
+
run
->
nWidth
>
wc
->
nAvailWidth
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment