Skip to content

Commit

Permalink
[egui] prepare for 0.1.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
emilk committed May 30, 2020
1 parent 2f4a3a1 commit bea7e3a
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 8 deletions.
5 changes: 2 additions & 3 deletions docs/example_wasm.js
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,12 @@ function getInt32Memory0() {
}
/**
* @param {string} canvas_id
* @param {number} pixels_per_point
* @returns {State}
*/
__exports.new_webgl_gui = function(canvas_id, pixels_per_point) {
__exports.new_webgl_gui = function(canvas_id) {
var ptr0 = passStringToWasm0(canvas_id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
var len0 = WASM_VECTOR_LEN;
var ret = wasm.new_webgl_gui(ptr0, len0, pixels_per_point);
var ret = wasm.new_webgl_gui(ptr0, len0);
return State.__wrap(ret);
};

Expand Down
Binary file modified docs/example_wasm_bg.wasm
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

function paint_gui(canvas) {
if (g_wasm_app === null) {
g_wasm_app = wasm_bindgen.new_webgl_gui("canvas", pixels_per_point());
g_wasm_app = wasm_bindgen.new_webgl_gui("canvas");
}

let input = {
Expand Down
11 changes: 9 additions & 2 deletions egui/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
[package]
name = "egui"
version = "0.1.0"
authors = ["Emil Ernerfeldt <emilernerfeldt@gmail.com>"]
license = "MIT OR Apache-2.0"
authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
description = "Simple, portable immediate mode GUI library for Rust"
edition = "2018"
homepage = "https://github.com/emilk/emigui/"
license = "MIT OR Apache-2.0"
readme = "../README.md"
repository = "https://github.com/emilk/emigui"
categories = ["gui", "graphics"]
keywords = ["gui", "imgui", "immediate", "portable", "gamedev"]
include = [ "**/*.rs", "Cargo.toml", "fonts/ProggyClean.ttf", "fonts/Comfortaa-Regular.ttf"]

[lib]

Expand Down
4 changes: 2 additions & 2 deletions egui/src/containers/window.rs
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@ impl<'open> Window<'open> {
let content_rect = collapsing
.add_contents(&mut frame.content_ui, |ui| {
resize.show(ui, |ui| {
// Add some spacing (item_spacing) between title and content:
ui.allocate_space(Vec2::zero());
// Add some spacing between title and content:
ui.allocate_space(ui.style().item_spacing);

if let Some(scroll) = scroll {
scroll.show(ui, add_contents)
Expand Down

0 comments on commit bea7e3a

Please sign in to comment.