mirror of https://gitlab.com/nakst/essence
remove resizeClearColor
This commit is contained in:
parent
7b53a6925d
commit
e22d4e799b
|
@ -1683,7 +1683,6 @@ bool ApplicationInstanceStart(int64_t applicationID, _EsApplicationStartupInform
|
||||||
|
|
||||||
EsHandle handle = EsSyscall(ES_SYSCALL_WINDOW_CREATE, ES_WINDOW_NORMAL, 0, 0, 0);
|
EsHandle handle = EsSyscall(ES_SYSCALL_WINDOW_CREATE, ES_WINDOW_NORMAL, 0, 0, 0);
|
||||||
instance->embeddedWindowHandle = handle;
|
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);
|
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);
|
m.createInstance.window = EsSyscall(ES_SYSCALL_WINDOW_SET_PROPERTY, handle, process->handle, 0, ES_WINDOW_PROPERTY_EMBED_OWNER);
|
||||||
|
|
||||||
|
|
|
@ -890,7 +890,6 @@ EsWindow *EsWindowCreate(EsInstance *instance, EsWindowStyle style) {
|
||||||
|
|
||||||
if (style == ES_WINDOW_NORMAL) {
|
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, 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;
|
window->activated = true;
|
||||||
EsPanel *panel = EsPanelCreate(window, ES_ELEMENT_NON_CLIENT | ES_CELL_FILL | ES_PANEL_Z_STACK);
|
EsPanel *panel = EsPanelCreate(window, ES_ELEMENT_NON_CLIENT | ES_CELL_FILL | ES_PANEL_Z_STACK);
|
||||||
panel->cName = "window stack";
|
panel->cName = "window stack";
|
||||||
|
|
|
@ -723,7 +723,6 @@ define ES_WINDOW_PROPERTY_EMBED (0x07)
|
||||||
define ES_WINDOW_PROPERTY_EMBED_INSETS (0x08)
|
define ES_WINDOW_PROPERTY_EMBED_INSETS (0x08)
|
||||||
define ES_WINDOW_PROPERTY_OBJECT (0x81) // Embedded window properties.
|
define ES_WINDOW_PROPERTY_OBJECT (0x81) // Embedded window properties.
|
||||||
define ES_WINDOW_PROPERTY_EMBED_OWNER (0x82)
|
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_OPAQUE (0xFFFF)
|
||||||
define ES_DRAW_BITMAP_XOR (0xFFFE)
|
define ES_DRAW_BITMAP_XOR (0xFFFE)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include <module.h>
|
#include <module.h>
|
||||||
|
|
||||||
#define TRACE_REPORTS
|
// #define TRACE_REPORTS
|
||||||
|
|
||||||
// TODO Key repeat not working on Qemu.
|
// TODO Key repeat not working on Qemu.
|
||||||
|
|
||||||
|
|
|
@ -463,8 +463,6 @@ SYSCALL_IMPLEMENT(ES_SYSCALL_WINDOW_SET_PROPERTY) {
|
||||||
embed->SetEmbedOwner(process);
|
embed->SetEmbedOwner(process);
|
||||||
KMutexRelease(&windowManager.mutex);
|
KMutexRelease(&windowManager.mutex);
|
||||||
SYSCALL_RETURN(process->handleTable.OpenHandle(embed, 0, KERNEL_OBJECT_EMBEDDED_WINDOW), false);
|
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 {
|
} else {
|
||||||
SYSCALL_RETURN(ES_FATAL_ERROR_OUT_OF_RANGE, true);
|
SYSCALL_RETURN(ES_FATAL_ERROR_OUT_OF_RANGE, true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,7 +19,6 @@ struct EmbeddedWindow {
|
||||||
volatile uint32_t handles;
|
volatile uint32_t handles;
|
||||||
struct Window *container;
|
struct Window *container;
|
||||||
EsObjectID id;
|
EsObjectID id;
|
||||||
uint32_t resizeClearColor;
|
|
||||||
bool closed;
|
bool closed;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -43,7 +42,6 @@ struct Window {
|
||||||
Surface surface;
|
Surface surface;
|
||||||
EsRectangle opaqueBounds, blurBounds;
|
EsRectangle opaqueBounds, blurBounds;
|
||||||
uint8_t alpha, material;
|
uint8_t alpha, material;
|
||||||
uint32_t resizeClearColor;
|
|
||||||
|
|
||||||
// Owner and children:
|
// Owner and children:
|
||||||
Process *owner;
|
Process *owner;
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue