From e22d4e799b3b2a98acaf129d987b11b697434ada Mon Sep 17 00:00:00 2001 From: nakst <> Date: Sun, 26 Sep 2021 09:25:39 +0100 Subject: [PATCH] remove resizeClearColor --- desktop/desktop.cpp | 1 - desktop/gui.cpp | 1 - desktop/os.header | 1 - drivers/usb_hid.cpp | 2 +- kernel/syscall.cpp | 2 -- kernel/windows.cpp | 2 -- res/Theme Source.dat | Bin 53017 -> 52990 bytes res/Themes/Theme.dat | Bin 53708 -> 53672 bytes 8 files changed, 1 insertion(+), 8 deletions(-) diff --git a/desktop/desktop.cpp b/desktop/desktop.cpp index d055165..0b87b5e 100644 --- a/desktop/desktop.cpp +++ b/desktop/desktop.cpp @@ -1683,7 +1683,6 @@ bool ApplicationInstanceStart(int64_t applicationID, _EsApplicationStartupInform EsHandle handle = EsSyscall(ES_SYSCALL_WINDOW_CREATE, ES_WINDOW_NORMAL, 0, 0, 0); instance->embeddedWindowHandle = handle; - EsSyscall(ES_SYSCALL_WINDOW_SET_PROPERTY, handle, 0xFF000000 | GetConstantNumber("windowFillColor"), 0, ES_WINDOW_PROPERTY_RESIZE_CLEAR_COLOR); instance->embeddedWindowID = EsSyscall(ES_SYSCALL_WINDOW_GET_ID, handle, 0, 0, 0); m.createInstance.window = EsSyscall(ES_SYSCALL_WINDOW_SET_PROPERTY, handle, process->handle, 0, ES_WINDOW_PROPERTY_EMBED_OWNER); diff --git a/desktop/gui.cpp b/desktop/gui.cpp index 331f898..80b68db 100644 --- a/desktop/gui.cpp +++ b/desktop/gui.cpp @@ -890,7 +890,6 @@ EsWindow *EsWindowCreate(EsInstance *instance, EsWindowStyle style) { if (style == ES_WINDOW_NORMAL) { EsSyscall(ES_SYSCALL_WINDOW_SET_PROPERTY, window->handle, 0, (uintptr_t) window, ES_WINDOW_PROPERTY_OBJECT); - EsSyscall(ES_SYSCALL_WINDOW_SET_PROPERTY, window->handle, 0xFF000000 | GetConstantNumber("windowFillColor"), 0, ES_WINDOW_PROPERTY_RESIZE_CLEAR_COLOR); window->activated = true; EsPanel *panel = EsPanelCreate(window, ES_ELEMENT_NON_CLIENT | ES_CELL_FILL | ES_PANEL_Z_STACK); panel->cName = "window stack"; diff --git a/desktop/os.header b/desktop/os.header index 680a74a..d0036db 100644 --- a/desktop/os.header +++ b/desktop/os.header @@ -723,7 +723,6 @@ define ES_WINDOW_PROPERTY_EMBED (0x07) define ES_WINDOW_PROPERTY_EMBED_INSETS (0x08) define ES_WINDOW_PROPERTY_OBJECT (0x81) // Embedded window properties. define ES_WINDOW_PROPERTY_EMBED_OWNER (0x82) -define ES_WINDOW_PROPERTY_RESIZE_CLEAR_COLOR (0x83) define ES_DRAW_BITMAP_OPAQUE (0xFFFF) define ES_DRAW_BITMAP_XOR (0xFFFE) diff --git a/drivers/usb_hid.cpp b/drivers/usb_hid.cpp index a25f7f9..88b8779 100644 --- a/drivers/usb_hid.cpp +++ b/drivers/usb_hid.cpp @@ -1,6 +1,6 @@ #include -#define TRACE_REPORTS +// #define TRACE_REPORTS // TODO Key repeat not working on Qemu. diff --git a/kernel/syscall.cpp b/kernel/syscall.cpp index 2d80dab..952c9b3 100644 --- a/kernel/syscall.cpp +++ b/kernel/syscall.cpp @@ -463,8 +463,6 @@ SYSCALL_IMPLEMENT(ES_SYSCALL_WINDOW_SET_PROPERTY) { embed->SetEmbedOwner(process); KMutexRelease(&windowManager.mutex); SYSCALL_RETURN(process->handleTable.OpenHandle(embed, 0, KERNEL_OBJECT_EMBEDDED_WINDOW), false); - } else if (property == ES_WINDOW_PROPERTY_RESIZE_CLEAR_COLOR) { - embed->resizeClearColor = argument1; } else { SYSCALL_RETURN(ES_FATAL_ERROR_OUT_OF_RANGE, true); } diff --git a/kernel/windows.cpp b/kernel/windows.cpp index 7f7d37a..4a57b4f 100644 --- a/kernel/windows.cpp +++ b/kernel/windows.cpp @@ -19,7 +19,6 @@ struct EmbeddedWindow { volatile uint32_t handles; struct Window *container; EsObjectID id; - uint32_t resizeClearColor; bool closed; }; @@ -43,7 +42,6 @@ struct Window { Surface surface; EsRectangle opaqueBounds, blurBounds; uint8_t alpha, material; - uint32_t resizeClearColor; // Owner and children: Process *owner; diff --git a/res/Theme Source.dat b/res/Theme Source.dat index d6d4ecd6e1780638bed762e708337bb6454d40fb..232da278d9887105ae3017a19f4443e7ff33ce91 100644 GIT binary patch delta 21 fcmV+w0P6plo&)}!1F)360iCmzy}AOkYQV1!c#sOy delta 48 zcmex2mwDzq<_%N!GS1sPb?+`Fss8fJyp;TMx6GUz=lq=fq7H)!Hvf=7 zKpEJFVpbZaaXZ(51?sgxjJa7Iac;6U!(!D>%vTI0j#jX{7*4O(O>uj7fPDexg~QFd zDTA9FS7G^5n(z&<`VvT#-kc6~DARba`|g4Yt)o2+%P ztd=ZIU@uK%_UyK71zRhz4$9D*9Nn;_NtUZ%cP7n&v0ku^c!s)fK2fhhuuh3N!9JE4 zJH*%~DV`Ttrsv{{fJSQ7LOm=Cr5)V}W|y`{6WA$g z$=U)-xnyYttCUz9*a3;P(_uvD5Z=-py1;xTb^+`lvUM-6xY2s(wwKA#3(KpLWdQ7o zM;(Os5ZF=AdZCg|u-82NL=8v5&PsC~19Rx~!tAOcXMV3Rc2TFD{BjAW@~I~OB$(ci zLZr~?sk4KN42+Gx-^N2Rw(i;kyYgVu=2E&jH88jgR`DBP;&IHFxvcHs)!&ZhR@3*e z*1|gROJd^UneVNNuFYc0j?ltsfx&gswO@|j%6RAZF@=qk2WzwIT6g4zd)5Egx$^b* zTId(Bwo29`PX|ojoQhl9Mi*gicSUwhnN<%bp1-{B-e?y+hP7L=2IRi~#PpkWcX}wq zJ21ExR&V!(Xy19Ho<4s3!nXsI<{da|NU|nZ=u2jPYMkjb(Cgj-vqoVS3A-o#H_f6I zhu*sR)tG_Kdj~`_pUKra`uLyI6AE|y!As)JpVgn(^4S01M)ENP1_w#j2ftkU^it#A zZJ}g^H5^v)pmh)V@V%vN}>dUFPLc{L^b?^TBU>AZgh z52vtzGs;*1UCNB2ZDs@g5U`4;P;y|l(i=$UGX$JT>0y3k%<`gML>nR(k+b-7 zS`qxVG7?Om1wZACuFZPLyQp)vgO^aWxl-vd3qQ5bJj9jmIkX~l4)xCoQbxwRs&Q@< z=SiwHbTQ|3WDg^}g7`d@_o*MxOW+)jtoa}DR{9{El=z78i<1KUs3f9`C#oUOEmnA` znig58h}2&AP~rJ%-a-?8Gf?@Wuf@sY{ahKg&|fW|@K*KB=sTR}QeMpa%2*8j5c3~p zB$ocZBuovAvvcLxQdf9`+Oc#*QJl-^cgtVrWpsAAgFDB+%P1njp*Ry?948Me_UwhARGleQV>P^Y`*b^+5i7j_IE+ z_>;1E2ko<;w)D0C%beGBliio;tN>V~vSaSruEv5051AtqE`g=@AmR=W$Yumb$M zC}HgK4#t{`(e7jpHnNkkkv$WG4J=|TelcTLp@As$7orb2#d#Q>-!CH&xD#wWd?VL` zLq{NE8vdJ=gCkZOl!$+1P0*l;u?tYHtL^bcf(I~JsBSlY+CSQjf#xvQjx6ir5okGM z!)T*2;NZj9jroinLw^hk4QH$d>T<~#fkB}z$nSZ^%Am+dJl#$_sTiOYs^9qIfJw--=w~RAP!2N8#XpMxOvE1(fm*V_eu6)e&>)nEs)(i3 z#xdrFau-4QMl6jGGBx8}Rtg=Q{|~9DysH2J delta 4404 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 b#y}6SA_Zq2o9>Pkwjl@(h|tqtU7P)XG@-j#