Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Yoann Laissus
wine
Commits
92d77c9b
Commit
92d77c9b
authored
23 years ago
by
Bill Medland
Committed by
Alexandre Julliard
23 years ago
Browse files
Options
Downloads
Patches
Plain Diff
DrawText should not split words just because of clipping.
parent
07539673
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/user/text.c
+4
-20
4 additions, 20 deletions
dlls/user/text.c
with
4 additions
and
20 deletions
dlls/user/text.c
+
4
−
20
View file @
92d77c9b
...
...
@@ -71,7 +71,6 @@ DEFAULT_DEBUG_CHANNEL(text);
#define SPACE 32
#define PREFIX 38
#define ELLIPSIS "..."
#define FORWARD_SLASH '/'
#define BACK_SLASH '\\'
...
...
@@ -144,7 +143,7 @@ static void TEXT_Ellipsify (HDC hdc, WCHAR *str, unsigned int max_len,
}
/*********************************************************************
* TEXT_PathEll
l
ipsify (static)
* TEXT_PathEllipsify (static)
*
* Add an ellipsis to the provided string in order to make it fit within
* the width. The ellipsis is added as specified for the DT_PATH_ELLIPSIS
...
...
@@ -394,12 +393,11 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count,
wb_i
=
i
+
1
;
wb_j
=
j
;
wb_count
=
*
count
;
plen
=
((
plen
/
tabwidth
)
+
1
)
*
tabwidth
;
}
normal_char
=
0
;
dest
[
j
++
]
=
str
[
i
++
];
if
(
!
(
format
&
DT_NOCLIP
)
||
(
format
&
DT_WORDBREAK
))
plen
=
((
plen
/
tabwidth
)
+
1
)
*
tabwidth
;
}
break
;
...
...
@@ -418,7 +416,7 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count,
if
(
normal_char
)
{
dest
[
j
++
]
=
str
[
i
++
];
if
(
!
(
format
&
DT_NOCLIP
)
||
(
format
&
DT_WORDBREAK
))
if
((
format
&
DT_WORDBREAK
))
{
if
(
!
GetTextExtentPointW
(
hdc
,
&
dest
[
j
-
1
],
1
,
&
size
))
return
NULL
;
...
...
@@ -427,25 +425,11 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count,
}
(
*
count
)
--
;
if
(
!
(
format
&
DT_NOCLIP
)
||
(
format
&
DT_WORDBREAK
)
)
if
(
(
format
&
DT_WORDBREAK
)
&&
plen
>
width
&&
wb_j
)
{
if
(
plen
>
width
)
{
if
(
format
&
DT_WORDBREAK
)
{
if
(
wb_j
)
{
*
len
=
wb_j
;
*
count
=
wb_count
-
1
;
return
(
&
str
[
wb_i
]);
}
}
else
{
*
len
=
j
;
return
(
&
str
[
i
]);
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment