diff --git a/CHANGELOG.md b/CHANGELOG.md index 7850a874..2554952e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Unreleased + +## 0.8.0 - 2021-01-17 - Grid layout & new visual style + + + ### Added ⭐ * Added a simple grid layout (`Grid`). diff --git a/Cargo.lock b/Cargo.lock index 4e57b7c5..9141e81e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -628,7 +628,7 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "eframe" -version = "0.7.0" +version = "0.8.0" dependencies = [ "egui", "egui_glium", @@ -638,7 +638,7 @@ dependencies = [ [[package]] name = "egui" -version = "0.7.0" +version = "0.8.0" dependencies = [ "epaint", "serde", @@ -646,7 +646,7 @@ dependencies = [ [[package]] name = "egui_demo_app" -version = "0.1.0" +version = "0.8.0" dependencies = [ "eframe", "egui_demo_lib", @@ -654,7 +654,7 @@ dependencies = [ [[package]] name = "egui_demo_lib" -version = "0.7.0" +version = "0.8.0" dependencies = [ "criterion", "egui", @@ -666,7 +666,7 @@ dependencies = [ [[package]] name = "egui_glium" -version = "0.7.0" +version = "0.8.0" dependencies = [ "chrono", "clipboard", @@ -682,7 +682,7 @@ dependencies = [ [[package]] name = "egui_web" -version = "0.7.0" +version = "0.8.0" dependencies = [ "egui", "epi", @@ -702,14 +702,14 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "emath" -version = "0.7.0" +version = "0.8.0" dependencies = [ "serde", ] [[package]] name = "epaint" -version = "0.7.0" +version = "0.8.0" dependencies = [ "ahash", "atomic_refcell", @@ -721,7 +721,7 @@ dependencies = [ [[package]] name = "epi" -version = "0.7.0" +version = "0.8.0" dependencies = [ "egui", "serde", diff --git a/README.md b/README.md index 02009f59..6c2db3dd 100644 --- a/README.md +++ b/README.md @@ -125,7 +125,7 @@ egui is in active development. It works well for what it does, but it lacks many * Tooltips on hover * More - + ## How it works diff --git a/docs/egui_demo_app.js b/docs/egui_demo_app.js index 57b62b3f..e6f2efb3 100644 --- a/docs/egui_demo_app.js +++ b/docs/egui_demo_app.js @@ -213,35 +213,35 @@ function makeMutClosure(arg0, arg1, dtor, f) { return real; } function __wbg_adapter_26(arg0, arg1) { - wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hc16cc95573108e86(arg0, arg1); + wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h9e83c030f4fba97b(arg0, arg1); } -function __wbg_adapter_29(arg0, arg1) { - wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h1ef11c34c6eb9840(arg0, arg1); +function __wbg_adapter_29(arg0, arg1, arg2) { + wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h87bcb88dca6dc0f0(arg0, arg1, addHeapObject(arg2)); } function __wbg_adapter_32(arg0, arg1, arg2) { - wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h3af8e3f07f026be0(arg0, arg1, addHeapObject(arg2)); + wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h87bcb88dca6dc0f0(arg0, arg1, addHeapObject(arg2)); } function __wbg_adapter_35(arg0, arg1, arg2) { - wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h3af8e3f07f026be0(arg0, arg1, addHeapObject(arg2)); + wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h87bcb88dca6dc0f0(arg0, arg1, addHeapObject(arg2)); } function __wbg_adapter_38(arg0, arg1, arg2) { - wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h3af8e3f07f026be0(arg0, arg1, addHeapObject(arg2)); + wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h87bcb88dca6dc0f0(arg0, arg1, addHeapObject(arg2)); } function __wbg_adapter_41(arg0, arg1, arg2) { - wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h3af8e3f07f026be0(arg0, arg1, addHeapObject(arg2)); + wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h87bcb88dca6dc0f0(arg0, arg1, addHeapObject(arg2)); } -function __wbg_adapter_44(arg0, arg1, arg2) { - wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h3af8e3f07f026be0(arg0, arg1, addHeapObject(arg2)); +function __wbg_adapter_44(arg0, arg1) { + wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h67efe31ef2177d57(arg0, arg1); } function __wbg_adapter_47(arg0, arg1, arg2) { - wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h6f43a93dde0ee379(arg0, arg1, addHeapObject(arg2)); + wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hfcae3bd1b2ceed2f(arg0, arg1, addHeapObject(arg2)); } /** @@ -257,6 +257,10 @@ __exports.start = function(canvas_id) { wasm.start(ptr0, len0); }; +function getArrayU8FromWasm0(ptr, len) { + return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len); +} + function handleError(f) { return function () { try { @@ -268,10 +272,6 @@ function handleError(f) { }; } -function getArrayU8FromWasm0(ptr, len) { - return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len); -} - async function load(module, imports) { if (typeof Response === 'function' && module instanceof Response) { @@ -320,10 +320,6 @@ async function init(input) { imports.wbg.__wbindgen_object_drop_ref = function(arg0) { takeObject(arg0); }; - imports.wbg.__wbindgen_string_new = function(arg0, arg1) { - var ret = getStringFromWasm0(arg0, arg1); - return addHeapObject(ret); - }; imports.wbg.__wbindgen_cb_drop = function(arg0) { const obj = takeObject(arg0).original; if (obj.cnt-- == 1) { @@ -333,6 +329,140 @@ async function init(input) { var ret = false; return ret; }; + imports.wbg.__wbindgen_string_new = function(arg0, arg1) { + var ret = getStringFromWasm0(arg0, arg1); + return addHeapObject(ret); + }; + imports.wbg.__wbg_instanceof_WebGl2RenderingContext_9818b789249374d3 = function(arg0) { + var ret = getObject(arg0) instanceof WebGL2RenderingContext; + return ret; + }; + imports.wbg.__wbg_drawingBufferWidth_efc3fcc01d710783 = function(arg0) { + var ret = getObject(arg0).drawingBufferWidth; + return ret; + }; + imports.wbg.__wbg_drawingBufferHeight_0ef66118ee2081ad = function(arg0) { + var ret = getObject(arg0).drawingBufferHeight; + return ret; + }; + imports.wbg.__wbg_bufferData_b5889c60c7d61946 = function(arg0, arg1, arg2, arg3) { + getObject(arg0).bufferData(arg1 >>> 0, getObject(arg2), arg3 >>> 0); + }; + imports.wbg.__wbg_texImage2D_79c0e000ef5e1b0a = handleError(function(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10) { + getObject(arg0).texImage2D(arg1 >>> 0, arg2, arg3, arg4, arg5, arg6, arg7 >>> 0, arg8 >>> 0, arg9 === 0 ? undefined : getArrayU8FromWasm0(arg9, arg10)); + }); + imports.wbg.__wbg_activeTexture_a756131b7b4547f3 = function(arg0, arg1) { + getObject(arg0).activeTexture(arg1 >>> 0); + }; + imports.wbg.__wbg_attachShader_386953a8caf97e31 = function(arg0, arg1, arg2) { + getObject(arg0).attachShader(getObject(arg1), getObject(arg2)); + }; + imports.wbg.__wbg_bindBuffer_2cb370d7ee8c8faa = function(arg0, arg1, arg2) { + getObject(arg0).bindBuffer(arg1 >>> 0, getObject(arg2)); + }; + imports.wbg.__wbg_bindTexture_f3ab6393f75a763f = function(arg0, arg1, arg2) { + getObject(arg0).bindTexture(arg1 >>> 0, getObject(arg2)); + }; + imports.wbg.__wbg_blendFunc_8593e88646aa2829 = function(arg0, arg1, arg2) { + getObject(arg0).blendFunc(arg1 >>> 0, arg2 >>> 0); + }; + imports.wbg.__wbg_clear_8e691dd4fbcdb78d = function(arg0, arg1) { + getObject(arg0).clear(arg1 >>> 0); + }; + imports.wbg.__wbg_clearColor_c478bc8e70dd1fde = function(arg0, arg1, arg2, arg3, arg4) { + getObject(arg0).clearColor(arg1, arg2, arg3, arg4); + }; + imports.wbg.__wbg_compileShader_3c4bd5d4666a9951 = function(arg0, arg1) { + getObject(arg0).compileShader(getObject(arg1)); + }; + imports.wbg.__wbg_createBuffer_a9e0a9167dc2f2b4 = function(arg0) { + var ret = getObject(arg0).createBuffer(); + return isLikeNone(ret) ? 0 : addHeapObject(ret); + }; + imports.wbg.__wbg_createProgram_4823f8197c94860f = function(arg0) { + var ret = getObject(arg0).createProgram(); + return isLikeNone(ret) ? 0 : addHeapObject(ret); + }; + imports.wbg.__wbg_createShader_9378e5028efeddcf = function(arg0, arg1) { + var ret = getObject(arg0).createShader(arg1 >>> 0); + return isLikeNone(ret) ? 0 : addHeapObject(ret); + }; + imports.wbg.__wbg_createTexture_151a385cd028c893 = function(arg0) { + var ret = getObject(arg0).createTexture(); + return isLikeNone(ret) ? 0 : addHeapObject(ret); + }; + imports.wbg.__wbg_disable_5c31195749c90c83 = function(arg0, arg1) { + getObject(arg0).disable(arg1 >>> 0); + }; + imports.wbg.__wbg_drawElements_4572c575d9e77ece = function(arg0, arg1, arg2, arg3, arg4) { + getObject(arg0).drawElements(arg1 >>> 0, arg2, arg3 >>> 0, arg4); + }; + imports.wbg.__wbg_enable_f7d5513a12216046 = function(arg0, arg1) { + getObject(arg0).enable(arg1 >>> 0); + }; + imports.wbg.__wbg_enableVertexAttribArray_3f2a29ade8fb65f9 = function(arg0, arg1) { + getObject(arg0).enableVertexAttribArray(arg1 >>> 0); + }; + imports.wbg.__wbg_getAttribLocation_713a1d120f1e32ba = function(arg0, arg1, arg2, arg3) { + var ret = getObject(arg0).getAttribLocation(getObject(arg1), getStringFromWasm0(arg2, arg3)); + return ret; + }; + imports.wbg.__wbg_getProgramInfoLog_900722958284ce83 = function(arg0, arg1, arg2) { + var ret = getObject(arg1).getProgramInfoLog(getObject(arg2)); + var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + var len0 = WASM_VECTOR_LEN; + getInt32Memory0()[arg0 / 4 + 1] = len0; + getInt32Memory0()[arg0 / 4 + 0] = ptr0; + }; + imports.wbg.__wbg_getProgramParameter_7f66eafe63848c93 = function(arg0, arg1, arg2) { + var ret = getObject(arg0).getProgramParameter(getObject(arg1), arg2 >>> 0); + return addHeapObject(ret); + }; + imports.wbg.__wbg_getShaderInfoLog_6e3d36e74e32aa2b = function(arg0, arg1, arg2) { + var ret = getObject(arg1).getShaderInfoLog(getObject(arg2)); + var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + var len0 = WASM_VECTOR_LEN; + getInt32Memory0()[arg0 / 4 + 1] = len0; + getInt32Memory0()[arg0 / 4 + 0] = ptr0; + }; + imports.wbg.__wbg_getShaderParameter_d3ad5fb12a1da258 = function(arg0, arg1, arg2) { + var ret = getObject(arg0).getShaderParameter(getObject(arg1), arg2 >>> 0); + return addHeapObject(ret); + }; + imports.wbg.__wbg_getUniformLocation_02d298730d44dadc = function(arg0, arg1, arg2, arg3) { + var ret = getObject(arg0).getUniformLocation(getObject(arg1), getStringFromWasm0(arg2, arg3)); + return isLikeNone(ret) ? 0 : addHeapObject(ret); + }; + imports.wbg.__wbg_linkProgram_be955380b2064b69 = function(arg0, arg1) { + getObject(arg0).linkProgram(getObject(arg1)); + }; + imports.wbg.__wbg_pixelStorei_8ec92e6e4c16982c = function(arg0, arg1, arg2) { + getObject(arg0).pixelStorei(arg1 >>> 0, arg2); + }; + imports.wbg.__wbg_scissor_967dc192f6260c23 = function(arg0, arg1, arg2, arg3, arg4) { + getObject(arg0).scissor(arg1, arg2, arg3, arg4); + }; + imports.wbg.__wbg_shaderSource_0b51ed30c2234a07 = function(arg0, arg1, arg2, arg3) { + getObject(arg0).shaderSource(getObject(arg1), getStringFromWasm0(arg2, arg3)); + }; + imports.wbg.__wbg_texParameteri_6e7ba8c54bb639f2 = function(arg0, arg1, arg2, arg3) { + getObject(arg0).texParameteri(arg1 >>> 0, arg2 >>> 0, arg3); + }; + imports.wbg.__wbg_uniform1i_2cb54693e4c3bace = function(arg0, arg1, arg2) { + getObject(arg0).uniform1i(getObject(arg1), arg2); + }; + imports.wbg.__wbg_uniform2f_9983be9fcaad4947 = function(arg0, arg1, arg2, arg3) { + getObject(arg0).uniform2f(getObject(arg1), arg2, arg3); + }; + imports.wbg.__wbg_useProgram_6b54e2f64672af62 = function(arg0, arg1) { + getObject(arg0).useProgram(getObject(arg1)); + }; + imports.wbg.__wbg_vertexAttribPointer_12aeb3ec86d48d18 = function(arg0, arg1, arg2, arg3, arg4, arg5, arg6) { + getObject(arg0).vertexAttribPointer(arg1 >>> 0, arg2, arg3 >>> 0, arg4 !== 0, arg5, arg6); + }; + imports.wbg.__wbg_viewport_ec826bf788ce964f = function(arg0, arg1, arg2, arg3, arg4) { + getObject(arg0).viewport(arg1, arg2, arg3, arg4); + }; imports.wbg.__wbg_instanceof_Window_49f532f06a9786ee = function(arg0) { var ret = getObject(arg0) instanceof Window; return ret; @@ -385,14 +515,37 @@ async function init(input) { var ret = getObject(arg0).setInterval(getObject(arg1), arg2); return ret; }); - imports.wbg.__wbg_body_c8cb19d760637268 = function(arg0) { - var ret = getObject(arg0).body; - return isLikeNone(ret) ? 0 : addHeapObject(ret); - }; - imports.wbg.__wbg_getElementById_15aef17a620252b4 = function(arg0, arg1, arg2) { - var ret = getObject(arg0).getElementById(getStringFromWasm0(arg1, arg2)); + imports.wbg.__wbindgen_object_clone_ref = function(arg0) { + var ret = getObject(arg0); + return addHeapObject(ret); + }; + imports.wbg.__wbg_clipboardData_503a7e4407c6231c = function(arg0) { + var ret = getObject(arg0).clipboardData; return isLikeNone(ret) ? 0 : addHeapObject(ret); }; + imports.wbg.__wbg_getItem_400dba7536e6a1d8 = handleError(function(arg0, arg1, arg2, arg3) { + var ret = getObject(arg1).getItem(getStringFromWasm0(arg2, arg3)); + var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + var len0 = WASM_VECTOR_LEN; + getInt32Memory0()[arg0 / 4 + 1] = len0; + getInt32Memory0()[arg0 / 4 + 0] = ptr0; + }); + imports.wbg.__wbg_setItem_57767b71f09c3545 = handleError(function(arg0, arg1, arg2, arg3, arg4) { + getObject(arg0).setItem(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); + }); + imports.wbg.__wbg_setProperty_46b9bd1b0fad730b = handleError(function(arg0, arg1, arg2, arg3, arg4) { + getObject(arg0).setProperty(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); + }); + imports.wbg.__wbg_addEventListener_6a37bc32387cb66d = handleError(function(arg0, arg1, arg2, arg3) { + getObject(arg0).addEventListener(getStringFromWasm0(arg1, arg2), getObject(arg3)); + }); + imports.wbg.__wbg_hash_6e2c452e02822d19 = handleError(function(arg0, arg1) { + var ret = getObject(arg1).hash; + var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + var len0 = WASM_VECTOR_LEN; + getInt32Memory0()[arg0 / 4 + 1] = len0; + getInt32Memory0()[arg0 / 4 + 0] = ptr0; + }); imports.wbg.__wbg_clientX_3a14a1583294607f = function(arg0) { var ret = getObject(arg0).clientX; return ret; @@ -461,14 +614,6 @@ async function init(input) { var ret = getObject(arg0).now(); return ret; }; - imports.wbg.__wbg_pageX_7d397506a4ad73f2 = function(arg0) { - var ret = getObject(arg0).pageX; - return ret; - }; - imports.wbg.__wbg_pageY_83f6542b172abf6f = function(arg0) { - var ret = getObject(arg0).pageY; - return ret; - }; imports.wbg.__wbg_headers_5f70b64960218e2f = function(arg0) { var ret = getObject(arg0).headers; return addHeapObject(ret); @@ -477,69 +622,25 @@ async function init(input) { var ret = new Request(getStringFromWasm0(arg0, arg1), getObject(arg2)); return addHeapObject(ret); }); + imports.wbg.__wbg_pageX_7d397506a4ad73f2 = function(arg0) { + var ret = getObject(arg0).pageX; + return ret; + }; + imports.wbg.__wbg_pageY_83f6542b172abf6f = function(arg0) { + var ret = getObject(arg0).pageY; + return ret; + }; imports.wbg.__wbg_get_3315e8e7e59a2c40 = function(arg0, arg1) { var ret = getObject(arg0)[arg1 >>> 0]; return isLikeNone(ret) ? 0 : addHeapObject(ret); }; - imports.wbg.__wbg_getData_10c8cb329803d2b8 = handleError(function(arg0, arg1, arg2, arg3) { - var ret = getObject(arg1).getData(getStringFromWasm0(arg2, arg3)); - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }); - imports.wbg.__wbg_instanceof_HtmlCanvasElement_7bd3ee7838f11fc3 = function(arg0) { - var ret = getObject(arg0) instanceof HTMLCanvasElement; - return ret; - }; - imports.wbg.__wbg_width_0efa4604d41c58c5 = function(arg0) { - var ret = getObject(arg0).width; - return ret; - }; - imports.wbg.__wbg_setwidth_1d0e975feecff3ef = function(arg0, arg1) { - getObject(arg0).width = arg1 >>> 0; - }; - imports.wbg.__wbg_height_aa24e3fef658c4a8 = function(arg0) { - var ret = getObject(arg0).height; - return ret; - }; - imports.wbg.__wbg_setheight_7758ee3ff5c65474 = function(arg0, arg1) { - getObject(arg0).height = arg1 >>> 0; - }; - imports.wbg.__wbg_getContext_3db9399e6dc524ff = handleError(function(arg0, arg1, arg2) { - var ret = getObject(arg0).getContext(getStringFromWasm0(arg1, arg2)); + imports.wbg.__wbg_body_c8cb19d760637268 = function(arg0) { + var ret = getObject(arg0).body; return isLikeNone(ret) ? 0 : addHeapObject(ret); - }); - imports.wbg.__wbg_keyCode_47f9e9228bc483bf = function(arg0) { - var ret = getObject(arg0).keyCode; - return ret; }; - imports.wbg.__wbg_altKey_8a59e1cf32636010 = function(arg0) { - var ret = getObject(arg0).altKey; - return ret; - }; - imports.wbg.__wbg_ctrlKey_17377b46ca5a072d = function(arg0) { - var ret = getObject(arg0).ctrlKey; - return ret; - }; - imports.wbg.__wbg_shiftKey_09be9a7e6cad7a99 = function(arg0) { - var ret = getObject(arg0).shiftKey; - return ret; - }; - imports.wbg.__wbg_metaKey_a707288e6c45a0e0 = function(arg0) { - var ret = getObject(arg0).metaKey; - return ret; - }; - imports.wbg.__wbg_isComposing_15a35cffb04ab10f = function(arg0) { - var ret = getObject(arg0).isComposing; - return ret; - }; - imports.wbg.__wbg_key_d9b602f48baca7bc = function(arg0, arg1) { - var ret = getObject(arg1).key; - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; + imports.wbg.__wbg_getElementById_15aef17a620252b4 = function(arg0, arg1, arg2) { + var ret = getObject(arg0).getElementById(getStringFromWasm0(arg1, arg2)); + return isLikeNone(ret) ? 0 : addHeapObject(ret); }; imports.wbg.__wbg_getBoundingClientRect_505844bd8eb35668 = function(arg0) { var ret = getObject(arg0).getBoundingClientRect(); @@ -549,6 +650,14 @@ async function init(input) { var ret = getObject(arg0) instanceof WebGLRenderingContext; return ret; }; + imports.wbg.__wbg_drawingBufferWidth_fab3e20dd1ba5d4e = function(arg0) { + var ret = getObject(arg0).drawingBufferWidth; + return ret; + }; + imports.wbg.__wbg_drawingBufferHeight_31bc93d4dc3a0dcc = function(arg0) { + var ret = getObject(arg0).drawingBufferHeight; + return ret; + }; imports.wbg.__wbg_bufferData_dc5899657e9f1803 = function(arg0, arg1, arg2, arg3) { getObject(arg0).bufferData(arg1 >>> 0, getObject(arg2), arg3 >>> 0); }; @@ -667,6 +776,9 @@ async function init(input) { imports.wbg.__wbg_error_e325755affc8634b = function(arg0) { console.error(getObject(arg0)); }; + imports.wbg.__wbg_log_f2e13ca55da8bad3 = function(arg0) { + console.log(getObject(arg0)); + }; imports.wbg.__wbg_warn_9e92ccdc67085e1b = function(arg0) { console.warn(getObject(arg0)); }; @@ -674,6 +786,66 @@ async function init(input) { var ret = getObject(arg0).style; return addHeapObject(ret); }; + imports.wbg.__wbg_getData_10c8cb329803d2b8 = handleError(function(arg0, arg1, arg2, arg3) { + var ret = getObject(arg1).getData(getStringFromWasm0(arg2, arg3)); + var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + var len0 = WASM_VECTOR_LEN; + getInt32Memory0()[arg0 / 4 + 1] = len0; + getInt32Memory0()[arg0 / 4 + 0] = ptr0; + }); + imports.wbg.__wbg_instanceof_HtmlCanvasElement_7bd3ee7838f11fc3 = function(arg0) { + var ret = getObject(arg0) instanceof HTMLCanvasElement; + return ret; + }; + imports.wbg.__wbg_width_0efa4604d41c58c5 = function(arg0) { + var ret = getObject(arg0).width; + return ret; + }; + imports.wbg.__wbg_setwidth_1d0e975feecff3ef = function(arg0, arg1) { + getObject(arg0).width = arg1 >>> 0; + }; + imports.wbg.__wbg_height_aa24e3fef658c4a8 = function(arg0) { + var ret = getObject(arg0).height; + return ret; + }; + imports.wbg.__wbg_setheight_7758ee3ff5c65474 = function(arg0, arg1) { + getObject(arg0).height = arg1 >>> 0; + }; + imports.wbg.__wbg_getContext_3db9399e6dc524ff = handleError(function(arg0, arg1, arg2) { + var ret = getObject(arg0).getContext(getStringFromWasm0(arg1, arg2)); + return isLikeNone(ret) ? 0 : addHeapObject(ret); + }); + imports.wbg.__wbg_keyCode_47f9e9228bc483bf = function(arg0) { + var ret = getObject(arg0).keyCode; + return ret; + }; + imports.wbg.__wbg_altKey_8a59e1cf32636010 = function(arg0) { + var ret = getObject(arg0).altKey; + return ret; + }; + imports.wbg.__wbg_ctrlKey_17377b46ca5a072d = function(arg0) { + var ret = getObject(arg0).ctrlKey; + return ret; + }; + imports.wbg.__wbg_shiftKey_09be9a7e6cad7a99 = function(arg0) { + var ret = getObject(arg0).shiftKey; + return ret; + }; + imports.wbg.__wbg_metaKey_a707288e6c45a0e0 = function(arg0) { + var ret = getObject(arg0).metaKey; + return ret; + }; + imports.wbg.__wbg_isComposing_15a35cffb04ab10f = function(arg0) { + var ret = getObject(arg0).isComposing; + return ret; + }; + imports.wbg.__wbg_key_d9b602f48baca7bc = function(arg0, arg1) { + var ret = getObject(arg1).key; + var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + var len0 = WASM_VECTOR_LEN; + getInt32Memory0()[arg0 / 4 + 1] = len0; + getInt32Memory0()[arg0 / 4 + 0] = ptr0; + }; imports.wbg.__wbg_preventDefault_9aab6c264e5df3ee = function(arg0) { getObject(arg0).preventDefault(); }; @@ -696,37 +868,6 @@ async function init(input) { var ret = getObject(arg0).clipboard; return addHeapObject(ret); }; - imports.wbg.__wbindgen_object_clone_ref = function(arg0) { - var ret = getObject(arg0); - return addHeapObject(ret); - }; - imports.wbg.__wbg_clipboardData_503a7e4407c6231c = function(arg0) { - var ret = getObject(arg0).clipboardData; - return isLikeNone(ret) ? 0 : addHeapObject(ret); - }; - imports.wbg.__wbg_getItem_400dba7536e6a1d8 = handleError(function(arg0, arg1, arg2, arg3) { - var ret = getObject(arg1).getItem(getStringFromWasm0(arg2, arg3)); - var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }); - imports.wbg.__wbg_setItem_57767b71f09c3545 = handleError(function(arg0, arg1, arg2, arg3, arg4) { - getObject(arg0).setItem(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); - }); - imports.wbg.__wbg_setProperty_46b9bd1b0fad730b = handleError(function(arg0, arg1, arg2, arg3, arg4) { - getObject(arg0).setProperty(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); - }); - imports.wbg.__wbg_addEventListener_6a37bc32387cb66d = handleError(function(arg0, arg1, arg2, arg3) { - getObject(arg0).addEventListener(getStringFromWasm0(arg1, arg2), getObject(arg3)); - }); - imports.wbg.__wbg_hash_6e2c452e02822d19 = handleError(function(arg0, arg1) { - var ret = getObject(arg1).hash; - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }); imports.wbg.__wbg_call_951bd0c6d815d6f1 = handleError(function(arg0, arg1) { var ret = getObject(arg0).call(getObject(arg1)); return addHeapObject(ret); @@ -870,36 +1011,36 @@ async function init(input) { var ret = wasm.memory; return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper2332 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 594, __wbg_adapter_26); + imports.wbg.__wbindgen_closure_wrapper2224 = function(arg0, arg1, arg2) { + var ret = makeMutClosure(arg0, arg1, 546, __wbg_adapter_26); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper2333 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 594, __wbg_adapter_29); + imports.wbg.__wbindgen_closure_wrapper2225 = function(arg0, arg1, arg2) { + var ret = makeMutClosure(arg0, arg1, 546, __wbg_adapter_29); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper2335 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 594, __wbg_adapter_32); + imports.wbg.__wbindgen_closure_wrapper2227 = function(arg0, arg1, arg2) { + var ret = makeMutClosure(arg0, arg1, 546, __wbg_adapter_32); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper2337 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 594, __wbg_adapter_35); + imports.wbg.__wbindgen_closure_wrapper2229 = function(arg0, arg1, arg2) { + var ret = makeMutClosure(arg0, arg1, 546, __wbg_adapter_35); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper2339 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 594, __wbg_adapter_38); + imports.wbg.__wbindgen_closure_wrapper2231 = function(arg0, arg1, arg2) { + var ret = makeMutClosure(arg0, arg1, 546, __wbg_adapter_38); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper2341 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 594, __wbg_adapter_41); + imports.wbg.__wbindgen_closure_wrapper2234 = function(arg0, arg1, arg2) { + var ret = makeMutClosure(arg0, arg1, 546, __wbg_adapter_41); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper2344 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 594, __wbg_adapter_44); + imports.wbg.__wbindgen_closure_wrapper2236 = function(arg0, arg1, arg2) { + var ret = makeMutClosure(arg0, arg1, 546, __wbg_adapter_44); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper3221 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 671, __wbg_adapter_47); + imports.wbg.__wbindgen_closure_wrapper3546 = function(arg0, arg1, arg2) { + var ret = makeMutClosure(arg0, arg1, 683, __wbg_adapter_47); return addHeapObject(ret); }; diff --git a/docs/egui_demo_app_bg.wasm b/docs/egui_demo_app_bg.wasm index 9e7cc112..dd272f8e 100644 Binary files a/docs/egui_demo_app_bg.wasm and b/docs/egui_demo_app_bg.wasm differ diff --git a/eframe/CHANGELOG.md b/eframe/CHANGELOG.md index 06eee1a5..a62c5dd3 100644 --- a/eframe/CHANGELOG.md +++ b/eframe/CHANGELOG.md @@ -7,4 +7,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Unreleased + +## 0.8.0 - 2021-01-17 + +* Update all egui-related dependencies to `0.8.0` + + +## 0.7.0 - 2021-01-04 + * Initial release of `eframe` diff --git a/eframe/Cargo.toml b/eframe/Cargo.toml index 3581eef9..62d78c62 100644 --- a/eframe/Cargo.toml +++ b/eframe/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "eframe" -version = "0.7.0" +version = "0.8.0" authors = ["Emil Ernerfeldt "] description = "egui framework - write GUI apps that compiles to web and/or natively" edition = "2018" @@ -8,23 +8,23 @@ homepage = "https://github.com/emilk/egui" license = "MIT OR Apache-2.0" readme = "README.md" repository = "https://github.com/emilk/egui" -categories = ["gui", "graphics"] +categories = ["gui", "game-development"] keywords = ["egui", "gui", "gamedev"] include = [ "**/*.rs", "Cargo.toml"] [lib] [dependencies] -egui = { version = "0.7.0", path = "../egui" } -epi = { version = "0.7.0", path = "../epi" } +egui = { version = "0.8.0", path = "../egui" } +epi = { version = "0.8.0", path = "../epi" } # For compiling natively: [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -egui_glium = { version = "0.7.0", path = "../egui_glium" } +egui_glium = { version = "0.8.0", path = "../egui_glium" } # For compiling to web: [target.'cfg(target_arch = "wasm32")'.dependencies] -egui_web = { version = "0.7.0", path = "../egui_web" } +egui_web = { version = "0.8.0", path = "../egui_web" } [features] default = [] diff --git a/egui/Cargo.toml b/egui/Cargo.toml index 4659e57b..6c4139b3 100644 --- a/egui/Cargo.toml +++ b/egui/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "egui" -version = "0.7.0" +version = "0.8.0" authors = ["Emil Ernerfeldt "] description = "Simple, portable immediate mode GUI library for Rust" edition = "2018" @@ -8,7 +8,7 @@ homepage = "https://github.com/emilk/egui" license = "MIT OR Apache-2.0" readme = "../README.md" repository = "https://github.com/emilk/egui" -categories = ["gui", "graphics"] +categories = ["gui", "game-development"] keywords = ["gui", "imgui", "immediate", "portable", "gamedev"] include = [ "**/*.rs", @@ -18,7 +18,7 @@ include = [ [lib] [dependencies] -epaint = { path = "../epaint", default-features = false } +epaint = { version = "0.8.0", path = "../epaint", default-features = false } serde = { version = "1", features = ["derive", "rc"], optional = true } [features] diff --git a/egui_demo_app/Cargo.toml b/egui_demo_app/Cargo.toml index 7a640d22..d51c1a8e 100644 --- a/egui_demo_app/Cargo.toml +++ b/egui_demo_app/Cargo.toml @@ -1,16 +1,17 @@ [package] name = "egui_demo_app" -version = "0.1.0" +version = "0.8.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2018" +publish = false [lib] crate-type = ["cdylib", "rlib"] [dependencies] -eframe = { version = "0.7.0", path = "../eframe", features = ["time"] } -egui_demo_lib = { version = "0.7.0", path = "../egui_demo_lib" } +eframe = { version = "0.8.0", path = "../eframe", features = ["time"] } +egui_demo_lib = { version = "0.8.0", path = "../egui_demo_lib" } [features] default = ["persistence"] diff --git a/egui_demo_lib/Cargo.toml b/egui_demo_lib/Cargo.toml index 4f597a56..d13364b1 100644 --- a/egui_demo_lib/Cargo.toml +++ b/egui_demo_lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "egui_demo_lib" -version = "0.7.0" +version = "0.8.0" authors = ["Emil Ernerfeldt "] description = "Example library for egui" edition = "2018" @@ -15,8 +15,8 @@ include = [ "**/*.rs", "Cargo.toml"] [lib] [dependencies] -egui = { version = "0.7.0", path = "../egui" } -epi = { version = "0.7.0", path = "../epi" } +egui = { version = "0.8.0", path = "../egui" } +epi = { version = "0.8.0", path = "../epi" } # feature "http": image = { version = "0.23", default_features = false, features = ["jpeg", "png"], optional = true } diff --git a/egui_glium/CHANGELOG.md b/egui_glium/CHANGELOG.md index e22e1ff6..c5c9d736 100644 --- a/egui_glium/CHANGELOG.md +++ b/egui_glium/CHANGELOG.md @@ -7,6 +7,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Unreleased + +## 0.8.0 - 2021-01-17 + ### Fixed 🐛 * Fix a bug where key releases weren't sent to egui diff --git a/egui_glium/Cargo.toml b/egui_glium/Cargo.toml index 6c513eac..39a58d77 100644 --- a/egui_glium/Cargo.toml +++ b/egui_glium/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "egui_glium" -version = "0.7.0" +version = "0.8.0" authors = ["Emil Ernerfeldt "] description = "Bindings for using egui natively using the glium library" edition = "2018" @@ -8,14 +8,14 @@ homepage = "https://github.com/emilk/egui" license = "MIT OR Apache-2.0" readme = "README.md" repository = "https://github.com/emilk/egui" -categories = ["gui", "graphics"] +categories = ["gui", "game-development"] keywords = ["glium", "egui", "gui", "gamedev"] include = [ "**/*.rs", "Cargo.toml"] [dependencies] clipboard = "0.5" -egui = { version = "0.7.0", path = "../egui" } -epi = { version = "0.7.0", path = "../epi" } +egui = { version = "0.8.0", path = "../egui" } +epi = { version = "0.8.0", path = "../epi" } glium = "0.29" webbrowser = "0.5" diff --git a/egui_web/CHANGELOG.md b/egui_web/CHANGELOG.md index b66ee085..f9db526b 100644 --- a/egui_web/CHANGELOG.md +++ b/egui_web/CHANGELOG.md @@ -7,6 +7,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Unreleased + +## 0.8.0 - 2021-01-17 + ### Added ⭐ * WebGL2 is now supported, with improved texture sampler. WebGL1 will be used as a fallback. diff --git a/egui_web/Cargo.toml b/egui_web/Cargo.toml index ffb1ab0a..8cb4708b 100644 --- a/egui_web/Cargo.toml +++ b/egui_web/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "egui_web" -version = "0.7.0" +version = "0.8.0" authors = ["Emil Ernerfeldt "] description = "Bindings for compiling egui code to WASM for a web page" license = "MIT OR Apache-2.0" @@ -8,7 +8,7 @@ edition = "2018" homepage = "https://github.com/emilk/egui" readme = "README.md" repository = "https://github.com/emilk/egui" -categories = ["gui", "graphics"] +categories = ["gui", "web-programming"] keywords = ["wasm", "web", "egui", "gui", "gamedev"] include = [ "**/*.rs", "Cargo.toml"] @@ -16,8 +16,8 @@ include = [ "**/*.rs", "Cargo.toml"] crate-type = ["cdylib", "rlib"] [dependencies] -egui = { version = "0.7.0", path = "../egui" } -epi = { version = "0.7.0", path = "../epi" } +egui = { version = "0.8.0", path = "../egui" } +epi = { version = "0.8.0", path = "../epi" } js-sys = "0.3" serde = { version = "1", optional = true } serde_json = { version = "1", optional = true } diff --git a/emath/Cargo.toml b/emath/Cargo.toml index 7e6286e0..bf9b3c76 100644 --- a/emath/Cargo.toml +++ b/emath/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "emath" -version = "0.7.0" +version = "0.8.0" authors = ["Emil Ernerfeldt "] description = "Minimal 2D math library for GUI work" edition = "2018" @@ -8,8 +8,8 @@ homepage = "https://github.com/emilk/egui" license = "MIT OR Apache-2.0" readme = "README.md" repository = "https://github.com/emilk/egui" -categories = ["gui", "math"] -keywords = ["gui", "math"] +categories = ["mathematics", "gui"] +keywords = ["math", "gui"] include = [ "**/*.rs", "Cargo.toml", diff --git a/epaint/Cargo.toml b/epaint/Cargo.toml index edc31fad..92857b15 100644 --- a/epaint/Cargo.toml +++ b/epaint/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "epaint" -version = "0.7.0" +version = "0.8.0" authors = ["Emil Ernerfeldt "] description = "Minimal 2D graphics library for GUI work" edition = "2018" @@ -8,8 +8,8 @@ homepage = "https://github.com/emilk/egui" license = "MIT OR Apache-2.0" readme = "README.md" repository = "https://github.com/emilk/egui" -categories = ["gui", "graphics"] -keywords = ["gui", "graphics"] +categories = ["graphics", "gui"] +keywords = ["graphics", "gui", "egui"] include = [ "**/*.rs", "Cargo.toml", @@ -19,7 +19,7 @@ include = [ [lib] [dependencies] -emath = { path = "../emath" } +emath = { version = "0.8.0", path = "../emath" } ahash = { version = "0.6", features = ["std"], default-features = false } atomic_refcell = { version = "0.1", optional = true } # Used instead of parking_lot when you are always using epaint in a single thread. About as fast as parking_lot. Panics on multi-threaded use. diff --git a/epi/CHANGELOG.md b/epi/CHANGELOG.md index dc51ada0..6d5c7d73 100644 --- a/epi/CHANGELOG.md +++ b/epi/CHANGELOG.md @@ -7,6 +7,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Unreleased + +## 0.8.0 - 2021-01-17 + * Simplify `TextureAllocator` interface. diff --git a/epi/Cargo.toml b/epi/Cargo.toml index e1c7469e..858cc400 100644 --- a/epi/Cargo.toml +++ b/epi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "epi" -version = "0.7.0" +version = "0.8.0" authors = ["Emil Ernerfeldt "] description = "Backend-agnostic interface for writing apps using egui" edition = "2018" @@ -8,14 +8,14 @@ homepage = "https://github.com/emilk/egui" license = "MIT OR Apache-2.0" readme = "README.md" repository = "https://github.com/emilk/egui" -categories = ["gui", "graphics"] +categories = ["gui", "game-development"] keywords = ["egui", "gui", "gamedev"] include = [ "**/*.rs", "Cargo.toml"] [lib] [dependencies] -egui = { version = "0.7.0", path = "../egui" } +egui = { version = "0.8.0", path = "../egui" } serde = { version = "1", optional = true } serde_json = { version = "1", optional = true } diff --git a/media/widget_gallery.gif b/media/widget_gallery_0.8.0.gif similarity index 100% rename from media/widget_gallery.gif rename to media/widget_gallery_0.8.0.gif