Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
e3b7c304
Commit
e3b7c304
authored
Mar 19, 2007
by
Mikołaj Zalewski
Committed by
Alexandre Julliard
Mar 21, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
comctl32: toolbar: Test standard buttons size.
parent
d4a67c43
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
11 deletions
+9
-11
toolbar.c
dlls/comctl32/tests/toolbar.c
+5
-1
toolbar.c
dlls/comctl32/toolbar.c
+4
-10
No files found.
dlls/comctl32/tests/toolbar.c
View file @
e3b7c304
...
@@ -350,12 +350,14 @@ static void test_add_bitmap(void)
...
@@ -350,12 +350,14 @@ static void test_add_bitmap(void)
CHECK_IMAGELIST
(
4
,
20
,
15
);
CHECK_IMAGELIST
(
4
,
20
,
15
);
ok
(
SendMessageA
(
hToolbar
,
TB_ADDBITMAP
,
1
,
(
LPARAM
)
&
bmp128
)
==
0
,
"TB_ADDBITMAP - unexpected return
\n
"
);
ok
(
SendMessageA
(
hToolbar
,
TB_ADDBITMAP
,
1
,
(
LPARAM
)
&
bmp128
)
==
0
,
"TB_ADDBITMAP - unexpected return
\n
"
);
CHECK_IMAGELIST
(
10
,
20
,
15
);
CHECK_IMAGELIST
(
10
,
20
,
15
);
/* however TB_SETBITMAPSIZE/add std bitmap won't change the image size (the button size does change
!
) */
/* however TB_SETBITMAPSIZE/add std bitmap won't change the image size (the button size does change) */
ok
(
SendMessageA
(
hToolbar
,
TB_SETBITMAPSIZE
,
0
,
MAKELONG
(
8
,
8
))
==
TRUE
,
"TB_SETBITMAPSIZE failed
\n
"
);
ok
(
SendMessageA
(
hToolbar
,
TB_SETBITMAPSIZE
,
0
,
MAKELONG
(
8
,
8
))
==
TRUE
,
"TB_SETBITMAPSIZE failed
\n
"
);
UpdateWindow
(
hToolbar
);
UpdateWindow
(
hToolbar
);
compare
((
int
)
SendMessageA
(
hToolbar
,
TB_GETBUTTONSIZE
,
0
,
0
),
MAKELONG
(
15
,
14
),
"%x"
);
CHECK_IMAGELIST
(
10
,
20
,
15
);
CHECK_IMAGELIST
(
10
,
20
,
15
);
ok
(
SendMessageA
(
hToolbar
,
TB_ADDBITMAP
,
0
,
(
LPARAM
)
&
stdsmall
)
==
1
,
"TB_SETBITMAPSIZE failed
\n
"
);
ok
(
SendMessageA
(
hToolbar
,
TB_ADDBITMAP
,
0
,
(
LPARAM
)
&
stdsmall
)
==
1
,
"TB_SETBITMAPSIZE failed
\n
"
);
UpdateWindow
(
hToolbar
);
UpdateWindow
(
hToolbar
);
compare
((
int
)
SendMessageA
(
hToolbar
,
TB_GETBUTTONSIZE
,
0
,
0
),
MAKELONG
(
23
,
22
),
"%x"
);
CHECK_IMAGELIST_TODO_COUNT
(
22
,
20
,
15
);
CHECK_IMAGELIST_TODO_COUNT
(
22
,
20
,
15
);
/* check standard bitmaps */
/* check standard bitmaps */
...
@@ -364,10 +366,12 @@ static void test_add_bitmap(void)
...
@@ -364,10 +366,12 @@ static void test_add_bitmap(void)
rebuild_toolbar
(
&
hToolbar
);
rebuild_toolbar
(
&
hToolbar
);
ok
(
SendMessageA
(
hToolbar
,
TB_ADDBITMAP
,
1
,
(
LPARAM
)
&
addbmp
)
==
0
,
"TB_ADDBITMAP - unexpected return
\n
"
);
ok
(
SendMessageA
(
hToolbar
,
TB_ADDBITMAP
,
1
,
(
LPARAM
)
&
addbmp
)
==
0
,
"TB_ADDBITMAP - unexpected return
\n
"
);
CHECK_IMAGELIST
(
15
,
16
,
16
);
CHECK_IMAGELIST
(
15
,
16
,
16
);
compare
((
int
)
SendMessageA
(
hToolbar
,
TB_GETBUTTONSIZE
,
0
,
0
),
MAKELONG
(
23
,
22
),
"%x"
);
addbmp
.
nID
=
IDB_STD_LARGE_COLOR
;
addbmp
.
nID
=
IDB_STD_LARGE_COLOR
;
rebuild_toolbar
(
&
hToolbar
);
rebuild_toolbar
(
&
hToolbar
);
ok
(
SendMessageA
(
hToolbar
,
TB_ADDBITMAP
,
1
,
(
LPARAM
)
&
addbmp
)
==
0
,
"TB_ADDBITMAP - unexpected return
\n
"
);
ok
(
SendMessageA
(
hToolbar
,
TB_ADDBITMAP
,
1
,
(
LPARAM
)
&
addbmp
)
==
0
,
"TB_ADDBITMAP - unexpected return
\n
"
);
CHECK_IMAGELIST
(
15
,
24
,
24
);
CHECK_IMAGELIST
(
15
,
24
,
24
);
compare
((
int
)
SendMessageA
(
hToolbar
,
TB_GETBUTTONSIZE
,
0
,
0
),
MAKELONG
(
31
,
30
),
"%x"
);
addbmp
.
nID
=
IDB_VIEW_SMALL_COLOR
;
addbmp
.
nID
=
IDB_VIEW_SMALL_COLOR
;
rebuild_toolbar
(
&
hToolbar
);
rebuild_toolbar
(
&
hToolbar
);
...
...
dlls/comctl32/toolbar.c
View file @
e3b7c304
...
@@ -2775,19 +2775,13 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam)
...
@@ -2775,19 +2775,13 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam)
/* Windows resize all the buttons to the size of a newly added standard image */
/* Windows resize all the buttons to the size of a newly added standard image */
if
(
lpAddBmp
->
nID
&
1
)
if
(
lpAddBmp
->
nID
&
1
)
{
{
/* large icons */
/* large icons: 24x24. Will make the button 31x30 */
SendMessageW
(
hwnd
,
TB_SETBITMAPSIZE
,
0
,
SendMessageW
(
hwnd
,
TB_SETBITMAPSIZE
,
0
,
MAKELPARAM
(
24
,
24
));
MAKELPARAM
((
WORD
)
24
,
(
WORD
)
24
));
SendMessageW
(
hwnd
,
TB_SETBUTTONSIZE
,
0
,
MAKELPARAM
((
WORD
)
31
,
(
WORD
)
30
));
}
}
else
else
{
{
/* small icons */
/* small icons: 16x16. Will make the buttons 23x22 */
SendMessageW
(
hwnd
,
TB_SETBITMAPSIZE
,
0
,
SendMessageW
(
hwnd
,
TB_SETBITMAPSIZE
,
0
,
MAKELPARAM
(
16
,
16
));
MAKELPARAM
((
WORD
)
16
,
(
WORD
)
16
));
SendMessageW
(
hwnd
,
TB_SETBUTTONSIZE
,
0
,
MAKELPARAM
((
WORD
)
22
,
(
WORD
)
22
));
}
}
TOOLBAR_CalcToolbar
(
hwnd
);
TOOLBAR_CalcToolbar
(
hwnd
);
...
...
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