Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop: (70 commits)
  docs(imgui): update readme, add images
  feat(imgui): add IMGUI.clear(), update deps
  feat(examples): update imgui demo
  feat(imgui): add IMGUI.draw flag, update components, add/update hash fns
  feat(examples): update imgui demo, add docs
  feat(imgui): add key handling for radialMenu()
  feat(imgui): add dialGroup, ringGroup, fix/update label hashing
  feat(imgui): add disabled component stack, update theme & behaviors
  feat(examples): update imgui demo
  feat(imgui): add theme stack, extract default event handlers
  feat(imgui): add cursor & LayoutBox support, add docs
  feat(examples): user state atom, add undo/redo support for imgui demo
  feat(imgui): non-destructive value updates, local state
  feat(imgui): update dropdown key handlers (Esc)
  refactor(imgui): extract hover behavior fns, fix button behavior
  fix(color): add proper rounding to rgbaInt()
  feat(examples): disable cursor blink, fix main sync close mode
  feat(imgui): add cursor blink config, update textFieldRaw()
  fix(rstream): preserve const enums
  feat(examples): add icon buttons to imgui demo
  ...
  • Loading branch information
postspectacular committed Aug 16, 2019
2 parents de95454 + 03d3283 commit 33b3a76
Show file tree
Hide file tree
Showing 47 changed files with 3,994 additions and 18 deletions.
Binary file added assets/imgui-layout.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/screenshots/imgui-all.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/screenshots/imgui-demo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions examples/imgui/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.cache
out
node_modules
yarn.lock
*.js
23 changes: 23 additions & 0 deletions examples/imgui/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# imgui

![screenshot](https://raw.githubusercontent.com/thi-ng/umbrella/feature/imgui/assets/screenshots/imgui-demo.png)

[Live demo](http://demo.thi.ng/umbrella/imgui/)

WIP prototyping example for
[@thi.ng/imgui](https://github.com/thi-ng/umbrella/tree/feature/imgui/packages/imgui)
and realisation via
[@thi.ng/hdom-canvas](https://github.com/thi-ng/umbrella/tree/master/packages/hdom-canvas).

Please consult package readmes for details. Also, please refer to the
[example build
instructions](https://github.com/thi-ng/umbrella/wiki/Example-build-instructions)
on the wiki.

## Authors

- Karsten Schmidt

## License

© 2019 Karsten Schmidt // Apache Software License 2.0
48 changes: 48 additions & 0 deletions examples/imgui/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
<meta
name="viewport"
content="width=device-width, user-scalable=0, minimum-scale=1, maximum-scale=1"
/>
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<title>imgui</title>
<link
href="https://unpkg.com/tachyons@4/css/tachyons.min.css"
rel="stylesheet"
/>
<link
href="https://fonts.googleapis.com/css?family=IBM+Plex+Mono&display=swap"
rel="stylesheet"
/>
<style>
.code {
font-family: "IBM Plex Mono";
}
</style>
</head>
<body class="sans-serif bg-black white ma0 pa0 overflow-hidden">
<div id="app"></div>
<div class="z-1 fixed bottom-0 right-0 pa3 tr f7 bg-black-20">
<div>
<div class="dib code dark-gray">Ctrl/Cmd+Z ::</div>
<div class="dib w4">Undo</div>
</div>
<div>
<div class="dib code dark-gray">Shift+Ctrl/Cmd+Z ::</div>
<div class="dib w4">Redo</div>
</div>
<div class="mb3">
<div class="dib code dark-gray">Ctrl ::</div>
<div class="dib w4">Show radial menu</div>
</div>
<a
class="link white"
href="https://github.com/thi-ng/umbrella/tree/feature/imgui/examples/imgui"
>Source code / Info</a
>
</div>
<script type="text/javascript" src="./src/index.ts"></script>
</body>
</html>
29 changes: 29 additions & 0 deletions examples/imgui/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"name": "imgui",
"version": "0.0.1",
"repository": "https://github.com/thi-ng/umbrella",
"author": "Karsten Schmidt <k+npm@thi.ng>",
"license": "Apache-2.0",
"scripts": {
"clean": "rm -rf .cache build out",
"build": "yarn clean && parcel build index.html -d out --public-url ./ --no-source-maps --no-cache --detailed-report --experimental-scope-hoisting",
"build:webpack": "../../node_modules/.bin/webpack --mode production",
"start": "parcel index.html -p 8080 --open"
},
"devDependencies": {
"parcel-bundler": "^1.12.3",
"terser": "^3.17.0",
"typescript": "^3.4.1"
},
"dependencies": {
"@thi.ng/api": "latest",
"@thi.ng/rstream": "latest",
"@thi.ng/transducers-hdom": "latest"
},
"browserslist": [
"last 3 Chrome versions"
],
"browser": {
"process": false
}
}
Loading

0 comments on commit 33b3a76

Please sign in to comment.