From dd397def14fa5ab938891a9d139e39dce803138e Mon Sep 17 00:00:00 2001 From: "SPraid (simba)" Date: Wed, 1 Aug 2007 02:00:19 +0000 Subject: [PATCH] shade window Y=4 interval boot screen for "d" parameter git-svn-id: svn://kolibrios.org@599 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/boot/booteng.inc | 3 ++- kernel/trunk/boot/bootet.inc | 3 ++- kernel/trunk/boot/bootge.inc | 3 ++- kernel/trunk/boot/bootru.inc | 3 ++- kernel/trunk/gui/window.inc | 9 +++++++-- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/kernel/trunk/boot/booteng.inc b/kernel/trunk/boot/booteng.inc index b10b8309be..ee5f2150f1 100644 --- a/kernel/trunk/boot/booteng.inc +++ b/kernel/trunk/boot/booteng.inc @@ -45,7 +45,8 @@ ask_dma db "Use DMA for HDD access? [1-yes, 2-only for reading, 3-no]: ", bdev db "Load ramdisk from [1-floppy; 2-C:\kolibri.img (FAT32);" db 13,10,186," " db "3-use preloaded ram-image from kernel restart;" - db 13,10,186,"4-create blank image]: ",0 + db 13,10,186," " + db "4-create blank image]: ",0 probetext db 13,10,13,10,186," Use standart graphics mode? [1-yes, " db "2-probe bios (Vesa 3.0)]: ",0 ;memokz256 db 13,10,186," RAM 256 Mb",0 diff --git a/kernel/trunk/boot/bootet.inc b/kernel/trunk/boot/bootet.inc index 02e7f9020b..284649d130 100644 --- a/kernel/trunk/boot/bootet.inc +++ b/kernel/trunk/boot/bootet.inc @@ -45,7 +45,8 @@ ask_dma db "Use DMA for HDD access? [1-yes, 2-only for reading, 3-no]: ", bdev db "Paigalda mфluketas [1-diskett; 2-C:\kolibri.img (FAT32);" db 13,10,186," " db "3-kasuta eellaaditud mфluketast kerneli restardist;" - db 13,10,186,"4-create blank image]: ",0 + db 13,10,186," " + db "4-create blank image]: ",0 probetext db 13,10,13,10,186," Kasuta standartset graafika reziimi? [1-jah, " db "2-leia biosist (Vesa 3.0)]: ",0 ;memokz256 db 13,10,186," RAM 256 Mb",0 diff --git a/kernel/trunk/boot/bootge.inc b/kernel/trunk/boot/bootge.inc index 4f7eadf369..c281a810d7 100644 --- a/kernel/trunk/boot/bootge.inc +++ b/kernel/trunk/boot/bootge.inc @@ -50,7 +50,8 @@ ask_dma db "Nutze DMA zum HDD Zugriff? [1-ja, 2-allein fur Lesen, 3-nein] bdev db "Lade die Ramdisk von [1-Diskette; 2-C:\kolibri.img (FAT32);" db 13,10,186," " db "3-benutze ein bereits geladenes Kernel image;" - db 13,10,186,"4-create blank image]: ",0 + db 13,10,186," " + db "4-create blank image]: ",0 probetext db 13,10,13,10,186," Nutze Standardgrafikmodi? [1-ja, " db "2-BIOS Test (Vesa 3.0)]: ",0 ;memokz256 db 13,10,186," RAM 256 Mb",0 diff --git a/kernel/trunk/boot/bootru.inc b/kernel/trunk/boot/bootru.inc index bf40b16910..3c7fb639d5 100644 --- a/kernel/trunk/boot/bootru.inc +++ b/kernel/trunk/boot/bootru.inc @@ -45,7 +45,8 @@ ask_dma db " bdev db "Загрузить образ из [1-дискета; 2-C:\kolibri.img (FAT32);" db 13,10,186," " db "3-использовать уже загруженный образ;" - db 13,10,186,"4-создать чистый образ]: ",0 + db 13,10,186," " + db "4-создать чистый образ]: ",0 probetext db 13,10,13,10,186," Стандартный видеорежим? [1-да, " db "2-проверить другие (Vesa 3.0)]: ",0 ;memokz256 db 13,10,186," RAM 256 Mb",0 diff --git a/kernel/trunk/gui/window.inc b/kernel/trunk/gui/window.inc index cdc98f4827..a6a4e0ff0b 100644 --- a/kernel/trunk/gui/window.inc +++ b/kernel/trunk/gui/window.inc @@ -1517,8 +1517,6 @@ checkwindows: je no_fullscreen_restore cmp edx, 0x01000000 je no_fullscreen_restore - cmp edx, 0x04000000 - je no_fullscreen_restore cmp [reposition],1 je no_window_sizing @@ -1550,6 +1548,13 @@ checkwindows: no_window_shade: + push edx + mov edx, [edi + WDATA.cl_workarea] + and edx, 0x0f000000 + cmp edx, 0x04000000 + pop edx + je no_fullscreen_restore + cmp [do_resize],1 ; fullscreen/restore ? jne no_fullscreen_restore cmp [latest_window_touch_delta],dword 50