Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2026-02-07 19:37:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

use GetSystemBitmapEx2 instead of GetSystemBitmapEx

Browse Source
This commit is contained in:
Vincent Wei
2020-02-26 21:32:11 +08:00
parent 3627f32f25
commit 6ee2617eb7
4 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/lf_classic.c
View File

@@ -1204,7 +1204,7 @@ static void draw_radio_button (HWND hWnd, HDC hdc, const RECT* pRect, int status
const BITMAP* radio_bmp;
radio_bmp =
GetSystemBitmapEx (__mg_wnd_rdr_classic.name, SYSBMP_RADIOBUTTON);
GetSystemBitmapEx2 (hdc, __mg_wnd_rdr_classic.name, SYSBMP_RADIOBUTTON);
w = pRect->right - pRect->left;
h = pRect->bottom - pRect->top;
@@ -1235,7 +1235,7 @@ static void draw_radio_button (HWND hWnd, HDC hdc, const RECT* pRect, int status
const BITMAP* radio_bmp;
radio_bmp =
GetSystemBitmapEx (__mg_wnd_rdr_classic.name, SYSBMP_RADIOBUTTON);
GetSystemBitmapEx2 (hdc, __mg_wnd_rdr_classic.name, SYSBMP_RADIOBUTTON);
/*
* We do not scale the image, but restrict the output in the specified
@@ -1278,7 +1278,7 @@ static void draw_check_button (HWND hWnd, HDC hdc, const RECT* pRect, int status
const BITMAP* check_bmp;
check_bmp =
GetSystemBitmapEx (__mg_wnd_rdr_classic.name, SYSBMP_CHECKBUTTON);
GetSystemBitmapEx2 (hdc, __mg_wnd_rdr_classic.name, SYSBMP_CHECKBUTTON);
w = pRect->right - pRect->left;
h = pRect->bottom - pRect->top;
@@ -1309,7 +1309,7 @@ static void draw_check_button (HWND hWnd, HDC hdc, const RECT* pRect, int status
const BITMAP* check_bmp;
check_bmp =
GetSystemBitmapEx (__mg_wnd_rdr_classic.name, SYSBMP_CHECKBUTTON);
GetSystemBitmapEx2 (hdc, __mg_wnd_rdr_classic.name, SYSBMP_CHECKBUTTON);
/*
* We do not scale the image, but restrict the output in the specified

4
src/gui/lf_fashion.c
View File

@@ -1540,7 +1540,7 @@ static void
draw_radio_button (HWND hWnd, HDC hdc, const RECT* pRect, int status)
{
const BITMAP* bmp =
GetSystemBitmapEx (wnd_rdr_fashion.name, SYSBMP_RADIOBUTTON);
GetSystemBitmapEx2 (hdc, wnd_rdr_fashion.name, SYSBMP_RADIOBUTTON);
_draw_radio_button (hWnd, hdc, pRect, status, bmp);
}
@@ -1549,7 +1549,7 @@ static void
draw_check_button (HWND hWnd, HDC hdc, const RECT* pRect, int status)
{
const BITMAP* bmp =
GetSystemBitmapEx (wnd_rdr_fashion.name, SYSBMP_CHECKBUTTON);
GetSystemBitmapEx2 (hdc, wnd_rdr_fashion.name, SYSBMP_CHECKBUTTON);
_draw_check_button (hdc, pRect, status, bmp);
}

4
src/gui/lf_flat.c
View File

@@ -1348,7 +1348,7 @@ static void draw_radio_button (HWND hWnd, HDC hdc, const RECT* pRect, int status
const BITMAP* radio_bmp;
radio_bmp =
GetSystemBitmapEx (__mg_wnd_rdr_flat.name, SYSBMP_RADIOBUTTON);
GetSystemBitmapEx2 (hdc, __mg_wnd_rdr_flat.name, SYSBMP_RADIOBUTTON);
/*
* We do not scale the image, but restrict the output in the specified
@@ -1389,7 +1389,7 @@ static void draw_check_button (HWND hWnd, HDC hdc, const RECT* pRect, int status
const BITMAP* check_bmp;
check_bmp =
GetSystemBitmapEx (__mg_wnd_rdr_flat.name, SYSBMP_CHECKBUTTON);
GetSystemBitmapEx2 (hdc, __mg_wnd_rdr_flat.name, SYSBMP_CHECKBUTTON);
/*
* We do not scale the image, but restrict the output in the specified

19
src/gui/lf_tiny.c
View File

@@ -1034,15 +1034,14 @@ static void draw_focus_frame (HDC hdc, const RECT *pRect, DWORD color)
static int
calc_we_area (HWND hWnd, int which, RECT* we_area);
static void draw_normal_item
(HWND hWnd, HDC hdc, const RECT* pRect, DWORD color)
static void draw_normal_item (HWND hWnd, HDC hdc, const RECT* pRect, DWORD color)
{
RECT rc;
const BITMAP* bg_bmp = NULL;
const WINDOWINFO* win_info = GetWindowInfo (hWnd);
gal_pixel old_bc;
bg_bmp = GetSystemBitmapEx (wnd_rdr_tiny.name, BGPIC_CUSTOM);
bg_bmp = GetSystemBitmapEx2 (hdc, wnd_rdr_tiny.name, BGPIC_CUSTOM);
if (bg_bmp == NULL)
{
@@ -1273,7 +1272,7 @@ static void draw_radio_button (HWND hWnd, HDC hdc, const RECT* pRect, int status
const BITMAP* radio_bmp;
radio_bmp =
GetSystemBitmapEx (wnd_rdr_tiny.name, SYSBMP_RADIOBUTTON);
GetSystemBitmapEx2 (hdc, wnd_rdr_tiny.name, SYSBMP_RADIOBUTTON);
w = pRect->right - pRect->left;
h = pRect->bottom - pRect->top;
@@ -1311,7 +1310,7 @@ static void draw_check_button (HWND hWnd, HDC hdc, const RECT* pRect, int status
const BITMAP* check_bmp;
check_bmp =
GetSystemBitmapEx (wnd_rdr_tiny.name, SYSBMP_CHECKBUTTON);
GetSystemBitmapEx2 (hdc, wnd_rdr_tiny.name, SYSBMP_CHECKBUTTON);
w = pRect->right - pRect->left;
h = pRect->bottom - pRect->top;
@@ -2678,13 +2677,11 @@ draw_custom_hotspot (HWND hWnd, HDC hdc, int ht_code, int state)
}
}
bg_bmp = GetSystemBitmapEx (wnd_rdr_tiny.name, BGPIC_CUSTOM);
if (NULL == bg_bmp)
{
bg_bmp = GetSystemBitmapEx2 (hdc, wnd_rdr_tiny.name, BGPIC_CUSTOM);
if (NULL == bg_bmp) {
erase_bkgnd (hWnd, hdc, &rc);
}
else
{
else {
if (0 == calc_we_area (hWnd, HT_TINY_BTNBAR, &rc))
{
gui_fill_box_with_bitmap_part_except_incompatible (hdc, rc.left, rc.top, RECTW (rc),
@@ -3785,7 +3782,7 @@ erase_background (HWND hWnd, HDC hdc, const RECT *rect)
PMAINWIN pWin;
pWin = MG_GET_WINDOW_PTR (hWnd);
bg_bmp = GetSystemBitmapEx (wnd_rdr_tiny.name, BGPIC_CUSTOM);
bg_bmp = GetSystemBitmapEx2 (hdc, wnd_rdr_tiny.name, BGPIC_CUSTOM);
if (bg_bmp){
SelectClipRect (hdc, rect);