ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-04 22:58:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'offical/master'

Browse Source
This commit is contained in:
ed
2024-05-30 13:20:34 -04:00
parent 71d62aaeb7 7bcf33c881
commit fba6f5ddc0
21 changed files with 306 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vendor/microui/microui.odin
Vendored
+6 -1
View File
@@ -319,7 +319,12 @@ default_draw_frame :: proc(ctx: ^Context, rect: Rect, colorid: Color_Type) {
}
}
init :: proc(ctx: ^Context, set_clipboard: proc(user_data: rawptr, text: string) -> (ok: bool), get_clipboard: proc(user_data: rawptr) -> (text: string, ok: bool), clipboard_user_data: rawptr) {
init :: proc(
ctx: ^Context,
set_clipboard: proc(user_data: rawptr, text: string) -> (ok: bool) = nil,
get_clipboard: proc(user_data: rawptr) -> (text: string, ok: bool) = nil,
clipboard_user_data: rawptr = nil,
) {
ctx^ = {} // zero memory
ctx.draw_frame = default_draw_frame
ctx._style = default_style
vendor/wasm/js/runtime.js
Vendored
+6 -6
View File
@@ -1443,7 +1443,12 @@ function odinSetupDefaultImports(wasmMemoryInterface, consoleElement) {
wmi.storeU8(off(1), !!e.isTrusted);
let base = off(0, 8);
if (e instanceof MouseEvent) {
if (e instanceof WheelEvent) {
wmi.storeF64(off(8), e.deltaX);
wmi.storeF64(off(8), e.deltaY);
wmi.storeF64(off(8), e.deltaZ);
wmi.storeU32(off(4), e.deltaMode);
} else if (e instanceof MouseEvent) {
wmi.storeI64(off(8), e.screenX);
wmi.storeI64(off(8), e.screenY);
wmi.storeI64(off(8), e.clientX);
@@ -1482,11 +1487,6 @@ function odinSetupDefaultImports(wasmMemoryInterface, consoleElement) {
wmi.storeI32(off(W), e.code.length)
wmi.storeString(off(16, 1), e.key);
wmi.storeString(off(16, 1), e.code);
} else if (e instanceof WheelEvent) {
wmi.storeF64(off(8), e.deltaX);
wmi.storeF64(off(8), e.deltaY);
wmi.storeF64(off(8), e.deltaZ);
wmi.storeU32(off(4), e.deltaMode);
} else if (e.type === 'scroll') {
wmi.storeF64(off(8), window.scrollX);
wmi.storeF64(off(8), window.scrollY);