mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-02-13 06:43:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improvements to vendor:microui

Browse Source
This commit is contained in:
gingerBill
2021-10-02 14:06:34 +01:00
parent 92a0ce991e
commit f7137bf367
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
vendor/microui/microui.odin vendored
View File

@@ -293,7 +293,8 @@ rect_overlaps_vec2 :: proc(r: Rect, p: Vec2) -> bool {
return p.x >= r.x && p.x < r.x + r.w && p.y >= r.y && p.y < r.y + r.h
}
@private default_draw_frame :: proc(ctx: ^Context, rect: Rect, colorid: Color_Type) {
@private
default_draw_frame :: proc(ctx: ^Context, rect: Rect, colorid: Color_Type) {
draw_rect(ctx, rect, ctx.style.colors[colorid])
if colorid == .SCROLL_BASE || colorid == .SCROLL_THUMB || colorid == .TITLE_BG {
return
@@ -453,7 +454,12 @@ check_clip :: proc(ctx: ^Context, r: Rect) -> Clip {
return .PART
}
@private push_layout :: proc(ctx: ^Context, body: Rect, scroll: Vec2) {
get_layout :: proc(ctx: ^Context) -> ^Layout {
return &ctx.layout_stack.items[ctx.layout_stack.idx - 1]
}
@private
push_layout :: proc(ctx: ^Context, body: Rect, scroll: Vec2) {
layout: Layout
layout.body = Rect{body.x - scroll.x, body.y - scroll.y, body.w, body.h}
layout.max = Vec2{-0x1000000, -0x1000000}
@@ -461,11 +467,8 @@ check_clip :: proc(ctx: ^Context, r: Rect) -> Clip {
layout_row(ctx, {0})
}
@private get_layout :: proc(ctx: ^Context) -> ^Layout {
return &ctx.layout_stack.items[ctx.layout_stack.idx - 1]
}
@private pop_container :: proc(ctx: ^Context) {
@private
pop_container :: proc(ctx: ^Context) {
cnt := get_current_container(ctx)
layout := get_layout(ctx)
cnt.content_size.x = layout.max.x - layout.body.x
@@ -712,6 +715,12 @@ layout_end_column :: proc(ctx: ^Context) {
a.max.y = max(a.max.y, b.max.y)
}
@(deferred_in=layout_end_column)
layout_column :: proc(ctx: ^Context) -> bool {
layout_begin_column(ctx)
return true
}
layout_row :: proc(ctx: ^Context, widths: []i32, height: i32 = 0) {
layout := get_layout(ctx)
items := len(widths)
@@ -1011,8 +1020,7 @@ parse_real :: #force_inline proc(s: string) -> (Real, bool) {
f, ok := strconv.parse_f64(s)
return Real(f), ok
}
@private
number_textbox :: proc(ctx: ^Context, value: ^Real, r: Rect, id: Id, fmt_string: string) -> bool {
if ctx.mouse_pressed_bits == {.LEFT} && .SHIFT in ctx.key_down_bits && ctx.hover_id == id {
ctx.number_edit_id = id
@@ -1181,7 +1189,8 @@ treenode :: proc(ctx: ^Context, label: string, opt := Options{}) -> Result_Set {
}
@private scrollbar :: proc(ctx: ^Context, cnt: ^Container, _b: ^Rect, cs: Vec2, id_string: string, i: int) {
@private
scrollbar :: proc(ctx: ^Context, cnt: ^Container, _b: ^Rect, cs: Vec2, id_string: string, i: int) {
b := (^struct{ pos, size: [2]i32 })(_b)
#assert(size_of(b^) == size_of(_b^))