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

add changes to ZNODEHEADER and init it to zero when allocating a new znode

Browse Source
This commit is contained in:
Vincent Wei
2020-01-20 18:36:30 +08:00
parent 3b1351b128
commit 371038040f
2 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/minigui.h
View File

@@ -1148,6 +1148,7 @@ typedef struct _ZNODEHEADER {
/** The window handle of the znode if it is a window. */
HWND hwnd;
/**
* The window handle of the znode's main window if it is a control
* with WS_EX_CTRLASMAINWIN style.
@@ -1166,7 +1167,6 @@ typedef struct _ZNODEHEADER {
#ifdef _MGSCHEMA_COMPOSITING
/** The count for changes of content */
unsigned int changes;
/**
* The compositing type for this znode.
* For more information, see \a SetMainWindowCompositing.

21
src/kernel/desktop.c
View File

@@ -1530,8 +1530,10 @@ static int srvStartTrackPopupMenu (int cli, const RECT* rc, HWND ptmi,
menu_nodes [zi->nr_popupmenus].rc = *rc;
menu_nodes [zi->nr_popupmenus].hwnd = ptmi;
#ifdef _MGSCHEMA_COMPOSITING
menu_nodes [zi->nr_popupmenus].mem_dc = memdc;
menu_nodes [zi->nr_popupmenus].changes = 0;
menu_nodes [zi->nr_popupmenus].ct = CT_OPAQUE;
menu_nodes [zi->nr_popupmenus].ct_arg = 0;
menu_nodes [zi->nr_popupmenus].mem_dc = memdc;
#endif
if (zi->cli_trackmenu == -1)
@@ -2326,23 +2328,8 @@ static int FreeZOrderNodeEx (ZORDERINFO* zi, int idx_znode, HDC* memdc)
}
/* Free round corners mask rect. */
if (type & ZOF_TW_TROUNDCNS ||
type & ZOF_TW_BROUNDCNS) {
#if 0
int tmp, idx = nodes[idx_znode].idx_mask_rect;
MASKRECT * first = GET_MASKRECT(zi);
while (idx) {
__mg_slot_clear_use ((unsigned char*)GET_MASKRECT_USAGEBMP(zi), idx);
tmp = (first+idx)->next;
(first+idx)->next = 0;
(first+idx)->prev = 0;
idx = tmp;
}
#else
if (type & ZOF_TW_TROUNDCNS || type & ZOF_TW_BROUNDCNS) {
clean_znode_maskrect (zi, nodes, idx_znode);
#endif
}
#ifndef _MGSCHEMA_COMPOSITING