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

ZOF_TF_TOPFOREVER -> ZOF_TF_STUCK

Browse Source
This commit is contained in:
Vincent Wei
2020-01-15 15:41:26 +08:00
parent a6d904f854
commit 1b7c1ffaf4
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/kernel/desktop-comm.c
View File

@@ -1636,7 +1636,7 @@ static void dskUpdateDesktopMenu (HMENU hDesktopMenu)
{
pWin = (PMAINWIN)(nodes[slot].fortestinghwnd);
if (pWin && pWin->WinType == TYPE_MAINWIN &&
!(nodes[slot].flags & ZOF_TF_TOPFOREVER)) {
!(nodes[slot].flags & ZOF_TF_STUCK)) {
if (pWin->dwStyle & WS_VISIBLE)
mii.state = MFS_ENABLED;
else

2
src/kernel/desktop-procs.c
View File

@@ -3061,7 +3061,7 @@ static BOOL _cb_update_dskmenu (void* context,
UPDATA_DSKMENU_INFO* info = (UPDATA_DSKMENU_INFO*) context;
if (node->flags & ZOF_TF_MAINWIN
&& !(node->flags & ZOF_TF_TOPFOREVER)) {
&& !(node->flags & ZOF_TF_STUCK)) {
if (node->flags & ZOF_VISIBLE)
info->mii.state = MFS_ENABLED;
else

10
src/kernel/desktop.c
View File

@@ -1779,7 +1779,7 @@ static int AllocZOrderNode (int cli, HWND hwnd, HWND main_win,
#if defined(_MG_ENABLE_SCREENSAVER) || defined(_MG_ENABLE_WATERMARK)
if (*first == 0
|| (nodes [*first].flags & ZOF_TF_TOPFOREVER) != ZOF_TF_TOPFOREVER)
|| (nodes [*first].flags & ZOF_TF_STUCK) != ZOF_TF_STUCK)
{
old_first = *first;
nodes [old_first].prev = free_slot;
@@ -1789,7 +1789,7 @@ static int AllocZOrderNode (int cli, HWND hwnd, HWND main_win,
else {
int pre_idx = *first;
while(*first) {
if ((nodes [*first].flags & ZOF_TF_TOPFOREVER) == ZOF_TF_TOPFOREVER) {
if ((nodes [*first].flags & ZOF_TF_STUCK) == ZOF_TF_STUCK) {
pre_idx = *first;
first = &nodes[*first].next;
}
@@ -2220,7 +2220,7 @@ int dskSetTopForEver(int cli, int idx_znode, BOOL show)
/* lock zi for change */
lock_zi_for_change (zi);
nodes[idx_znode].flags |= ZOF_TF_TOPFOREVER;
nodes[idx_znode].flags |= ZOF_TF_STUCK;
/* unlock zi for change */
unlock_zi_for_change (zi);
@@ -2323,7 +2323,7 @@ static int dskMove2Top (int cli, int idx_znode)
}
#if defined(_MG_ENABLE_SCREENSAVER) || defined(_MG_ENABLE_WATERMARK)
if (!(*first) || ((nodes [*first].flags & ZOF_TF_TOPFOREVER) != ZOF_TF_TOPFOREVER))
if (!(*first) || ((nodes [*first].flags & ZOF_TF_STUCK) != ZOF_TF_STUCK))
{
nodes [idx_znode].prev = nodes[*first].prev;
nodes [idx_znode].next = *first;
@@ -2332,7 +2332,7 @@ static int dskMove2Top (int cli, int idx_znode)
else {
int pre_idx = *first;
while(*first) {
if ((nodes [*first].flags & ZOF_TF_TOPFOREVER) == ZOF_TF_TOPFOREVER) {
if ((nodes [*first].flags & ZOF_TF_STUCK) == ZOF_TF_STUCK) {
pre_idx = *first;
first = &nodes[*first].next;
}

3
src/server/layer.c
View File

@@ -116,6 +116,9 @@ static BOOL do_alloc_layer (MG_Layer* layer, const char* name,
zi->size_usage_bmp = SIZE_USAGE_BMP;
zi->size_maskrect_usage_bmp = SIZE_MASKRECT_USAGE_BMP;
_DGB_PRINTF("size_zi: %lu, size_usage_bmp: %d, size_maskrect_usage_bmp: %d\n",
sizeof (*zi), zi->size_usage_bmp, zi->size_maskrect_usage_bmp);
zi->max_nr_popupmenus = DEF_NR_POPUPMENUS;
zi->max_nr_globals = SHAREDRES_NR_GLOBALS;
zi->max_nr_topmosts = nr_topmosts;