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
18fa3287
Commit
18fa3287
authored
May 07, 2012
by
Dylan Smith
Committed by
Alexandre Julliard
May 08, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
richedit: Remove always FALSE parameter from ME_PaintContent.
parent
9af543aa
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
22 deletions
+11
-22
editor.c
dlls/riched20/editor.c
+1
-1
editor.h
dlls/riched20/editor.h
+1
-1
paint.c
dlls/riched20/paint.c
+8
-20
wrap.c
dlls/riched20/wrap.c
+1
-0
No files found.
dlls/riched20/editor.c
View file @
18fa3287
...
@@ -4463,7 +4463,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam,
...
@@ -4463,7 +4463,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam,
ps
.
rcPaint
.
right
=
editor
->
rcFormat
.
right
;
ps
.
rcPaint
.
right
=
editor
->
rcFormat
.
right
;
}
}
ME_PaintContent
(
editor
,
hDC
,
FALSE
,
&
ps
.
rcPaint
);
ME_PaintContent
(
editor
,
hDC
,
&
ps
.
rcPaint
);
EndPaint
(
editor
->
hWnd
,
&
ps
);
EndPaint
(
editor
->
hWnd
,
&
ps
);
return
0
;
return
0
;
}
}
...
...
dlls/riched20/editor.h
View file @
18fa3287
...
@@ -207,7 +207,7 @@ void ME_MarkAllForWrapping(ME_TextEditor *editor) DECLSPEC_HIDDEN;
...
@@ -207,7 +207,7 @@ void ME_MarkAllForWrapping(ME_TextEditor *editor) DECLSPEC_HIDDEN;
void
ME_SetDefaultParaFormat
(
PARAFORMAT2
*
pFmt
)
DECLSPEC_HIDDEN
;
void
ME_SetDefaultParaFormat
(
PARAFORMAT2
*
pFmt
)
DECLSPEC_HIDDEN
;
/* paint.c */
/* paint.c */
void
ME_PaintContent
(
ME_TextEditor
*
editor
,
HDC
hDC
,
BOOL
bOnlyNew
,
const
RECT
*
rcUpdate
)
DECLSPEC_HIDDEN
;
void
ME_PaintContent
(
ME_TextEditor
*
editor
,
HDC
hDC
,
const
RECT
*
rcUpdate
)
DECLSPEC_HIDDEN
;
void
ME_Repaint
(
ME_TextEditor
*
editor
)
DECLSPEC_HIDDEN
;
void
ME_Repaint
(
ME_TextEditor
*
editor
)
DECLSPEC_HIDDEN
;
void
ME_RewrapRepaint
(
ME_TextEditor
*
editor
)
DECLSPEC_HIDDEN
;
void
ME_RewrapRepaint
(
ME_TextEditor
*
editor
)
DECLSPEC_HIDDEN
;
void
ME_UpdateRepaint
(
ME_TextEditor
*
editor
,
BOOL
update_now
)
DECLSPEC_HIDDEN
;
void
ME_UpdateRepaint
(
ME_TextEditor
*
editor
,
BOOL
update_now
)
DECLSPEC_HIDDEN
;
...
...
dlls/riched20/paint.c
View file @
18fa3287
...
@@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit);
...
@@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit);
static
void
ME_DrawParagraph
(
ME_Context
*
c
,
ME_DisplayItem
*
paragraph
);
static
void
ME_DrawParagraph
(
ME_Context
*
c
,
ME_DisplayItem
*
paragraph
);
void
ME_PaintContent
(
ME_TextEditor
*
editor
,
HDC
hDC
,
BOOL
bOnlyNew
,
const
RECT
*
rcUpdate
)
void
ME_PaintContent
(
ME_TextEditor
*
editor
,
HDC
hDC
,
const
RECT
*
rcUpdate
)
{
{
ME_DisplayItem
*
item
;
ME_DisplayItem
*
item
;
ME_Context
c
;
ME_Context
c
;
...
@@ -71,17 +71,14 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT *
...
@@ -71,17 +71,14 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT *
ys
-=
item
->
member
.
para
.
pCell
->
member
.
cell
.
yTextOffset
;
ys
-=
item
->
member
.
para
.
pCell
->
member
.
cell
.
yTextOffset
;
}
}
if
(
!
bOnlyNew
||
(
item
->
member
.
para
.
nFlags
&
MEPF_REPAINT
))
/* Draw the paragraph if any of the paragraph is in the update region. */
if
(
ys
<
rcUpdate
->
bottom
&&
ye
>
rcUpdate
->
top
)
{
{
/* Draw the paragraph if any of the paragraph is in the update region. */
ME_DrawParagraph
(
&
c
,
item
);
if
(
ys
<
rcUpdate
->
bottom
&&
ye
>
rcUpdate
->
top
)
/* Clear the repaint flag if the whole paragraph is in the
{
* update region. */
ME_DrawParagraph
(
&
c
,
item
);
if
(
rcUpdate
->
top
<=
ys
&&
rcUpdate
->
bottom
>=
ye
)
/* Clear the repaint flag if the whole paragraph is in the
item
->
member
.
para
.
nFlags
&=
~
MEPF_REPAINT
;
* update region. */
if
(
rcUpdate
->
top
<=
ys
&&
rcUpdate
->
bottom
>=
ye
)
item
->
member
.
para
.
nFlags
&=
~
MEPF_REPAINT
;
}
}
}
item
=
item
->
member
.
para
.
next_para
;
item
=
item
->
member
.
para
.
next_para
;
}
}
...
@@ -94,15 +91,6 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT *
...
@@ -94,15 +91,6 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT *
rc
.
bottom
=
c
.
rcView
.
bottom
;
rc
.
bottom
=
c
.
rcView
.
bottom
;
rc
.
right
=
c
.
rcView
.
right
;
rc
.
right
=
c
.
rcView
.
right
;
if
(
bOnlyNew
)
{
/* Only erase region drawn from previous call to ME_PaintContent */
if
(
editor
->
nTotalLength
<
editor
->
nLastTotalLength
)
rc
.
bottom
=
c
.
pt
.
y
+
editor
->
nLastTotalLength
;
else
SetRectEmpty
(
&
rc
);
}
IntersectRect
(
&
rc
,
&
rc
,
rcUpdate
);
IntersectRect
(
&
rc
,
&
rc
,
rcUpdate
);
if
(
!
IsRectEmpty
(
&
rc
))
if
(
!
IsRectEmpty
(
&
rc
))
...
...
dlls/riched20/wrap.c
View file @
18fa3287
...
@@ -753,6 +753,7 @@ void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor)
...
@@ -753,6 +753,7 @@ void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor)
+
item
->
member
.
para
.
nHeight
-
ofs
,
+
item
->
member
.
para
.
nHeight
-
ofs
,
c
.
rcView
.
bottom
);
c
.
rcView
.
bottom
);
ITextHost_TxInvalidateRect
(
editor
->
texthost
,
&
rc
,
TRUE
);
ITextHost_TxInvalidateRect
(
editor
->
texthost
,
&
rc
,
TRUE
);
item
->
member
.
para
.
nFlags
&=
~
MEPF_REPAINT
;
}
}
item
=
item
->
member
.
para
.
next_para
;
item
=
item
->
member
.
para
.
next_para
;
}
}
...
...
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