Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-fonts
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
Aleksandr Isakov
wine-fonts
Commits
ac6a0d89
Commit
ac6a0d89
authored
Oct 05, 2016
by
Huw Davies
Committed by
Alexandre Julliard
Oct 05, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
riched20: Alter ME_SaveTempStyle() to accept the new style.
Signed-off-by:
Huw Davies
<
huw@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
4989c858
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
8 deletions
+9
-8
editor.c
dlls/riched20/editor.c
+3
-3
editor.h
dlls/riched20/editor.h
+1
-1
style.c
dlls/riched20/style.c
+5
-4
No files found.
dlls/riched20/editor.c
View file @
ac6a0d89
...
...
@@ -2392,7 +2392,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey)
}
style
=
ME_GetInsertStyle
(
editor
,
0
);
ME_SaveTempStyle
(
editor
);
ME_SaveTempStyle
(
editor
,
style
);
ME_ContinueCoalescingTransaction
(
editor
);
if
(
shift_is_down
)
ME_InsertEndRowFromCursor
(
editor
,
0
);
...
...
@@ -2566,7 +2566,7 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode,
if
(
editor
->
nTextLimit
>
ME_GetTextLength
(
editor
)
-
(
to
-
from
))
{
ME_Style
*
style
=
ME_GetInsertStyle
(
editor
,
0
);
ME_SaveTempStyle
(
editor
);
ME_SaveTempStyle
(
editor
,
style
);
ME_ContinueCoalescingTransaction
(
editor
);
ME_InsertTextFromCursor
(
editor
,
0
,
&
wstr
,
1
,
style
);
ME_ReleaseStyle
(
style
);
...
...
@@ -4538,7 +4538,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam,
ME_Style
*
style
=
ME_GetInsertStyle
(
editor
,
0
);
hIMC
=
ITextHost_TxImmGetContext
(
editor
->
texthost
);
ME_DeleteSelection
(
editor
);
ME_SaveTempStyle
(
editor
);
ME_SaveTempStyle
(
editor
,
style
);
if
(
lParam
&
(
GCS_RESULTSTR
|
GCS_COMPSTR
))
{
LPWSTR
lpCompStr
=
NULL
;
...
...
dlls/riched20/editor.h
View file @
ac6a0d89
...
...
@@ -76,7 +76,7 @@ ME_Style *ME_ApplyStyle(ME_TextEditor *ed, ME_Style *sSrc, CHARFORMAT2W *style)
HFONT
ME_SelectStyleFont
(
ME_Context
*
c
,
ME_Style
*
s
)
DECLSPEC_HIDDEN
;
void
ME_UnselectStyleFont
(
ME_Context
*
c
,
ME_Style
*
s
,
HFONT
hOldFont
)
DECLSPEC_HIDDEN
;
void
ME_InitCharFormat2W
(
CHARFORMAT2W
*
pFmt
)
DECLSPEC_HIDDEN
;
void
ME_SaveTempStyle
(
ME_TextEditor
*
editor
)
DECLSPEC_HIDDEN
;
void
ME_SaveTempStyle
(
ME_TextEditor
*
editor
,
ME_Style
*
style
)
DECLSPEC_HIDDEN
;
void
ME_ClearTempStyle
(
ME_TextEditor
*
editor
)
DECLSPEC_HIDDEN
;
void
ME_DumpStyleToBuf
(
CHARFORMAT2W
*
pFmt
,
char
buf
[
2048
])
DECLSPEC_HIDDEN
;
void
ME_DumpStyle
(
ME_Style
*
s
)
DECLSPEC_HIDDEN
;
...
...
dlls/riched20/style.c
View file @
ac6a0d89
...
...
@@ -513,12 +513,13 @@ ME_Style *ME_GetInsertStyle(ME_TextEditor *editor, int nCursor)
}
}
void
ME_SaveTempStyle
(
ME_TextEditor
*
editor
)
void
ME_SaveTempStyle
(
ME_TextEditor
*
editor
,
ME_Style
*
style
)
{
ME_Style
*
old_style
=
editor
->
pBuffer
->
pCharStyle
;
editor
->
pBuffer
->
pCharStyle
=
ME_GetInsertStyle
(
editor
,
0
);
if
(
old_style
)
ME_ReleaseStyle
(
old_style
);
if
(
style
)
ME_AddRefStyle
(
style
);
editor
->
pBuffer
->
pCharStyle
=
style
;
if
(
old_style
)
ME_ReleaseStyle
(
old_style
);
}
void
ME_ClearTempStyle
(
ME_TextEditor
*
editor
)
...
...
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