mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

term.ui: use the new [flag] enums (#8881)

Browse Source
This commit is contained in:
spaceface
2021-02-21 15:07:49 +01:00
committed by GitHub
parent 0470baafa6
commit 260f677469
8 changed files with 92 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
examples/term.ui/term_drawing.v
View File

@@ -174,8 +174,8 @@ fn event(event &ui.Event, x voidptr) {
y: event.y
}
d := event.direction == .down
if event.modifiers & ui.ctrl != 0 {
p := event.modifiers & ui.shift == 0
if event.modifiers.has(.ctrl) {
p := !event.modifiers.has(.shift)
c := if d {
if p { app.primary_color_idx - 1 } else { app.secondary_color_idx - 1 }
} else {
@@ -212,43 +212,53 @@ fn event(event &ui.Event, x voidptr) {
}
app.paint(nevent)
}
.space {
.space, .enter {
oevent := *event
nevent := ui.Event{
...oevent
button: ui.MouseButton.middle
button: .left
x: app.mouse_pos.x
y: app.mouse_pos.y
}
app.paint(nevent)
}
.delete, .backspace {
oevent := *event
nevent := ui.Event{
...oevent
button: .middle
x: app.mouse_pos.x
y: app.mouse_pos.y
}
app.paint(nevent)
}
.j, .down {
if event.modifiers & ui.shift != 0 {
if event.modifiers.has(.shift) {
app.set_pixel((1 + app.mouse_pos.x) / 2, app.mouse_pos.y, app.primary_color)
}
app.mouse_pos.y++
}
.k, .up {
if event.modifiers & ui.shift != 0 {
if event.modifiers.has(.shift) {
app.set_pixel((1 + app.mouse_pos.x) / 2, app.mouse_pos.y, app.primary_color)
}
app.mouse_pos.y--
}
.h, .left {
if event.modifiers & ui.shift != 0 {
if event.modifiers.has(.shift) {
app.set_pixel((1 + app.mouse_pos.x) / 2, app.mouse_pos.y, app.primary_color)
}
app.mouse_pos.x -= 2
}
.l, .right {
if event.modifiers & ui.shift != 0 {
if event.modifiers.has(.shift) {
app.set_pixel((1 + app.mouse_pos.x) / 2, app.mouse_pos.y, app.primary_color)
}
app.mouse_pos.x += 2
}
.t {
p := event.modifiers & ui.alt == 0
c := if event.modifiers & ui.shift != 0 {
p := !event.modifiers.has(.alt)
c := if event.modifiers.has(.shift) {
if p { app.primary_color_idx - 19 } else { app.secondary_color_idx - 19 }
} else {
if p { app.primary_color_idx + 19 } else { app.secondary_color_idx + 19 }
@@ -256,8 +266,8 @@ fn event(event &ui.Event, x voidptr) {
app.select_color(p, c)
}
.r {
p := event.modifiers & ui.alt == 0
c := if event.modifiers & ui.shift != 0 {
p := !event.modifiers.has(.alt)
c := if event.modifiers.has(.shift) {
if p { app.primary_color_idx - 1 } else { app.secondary_color_idx - 1 }
} else {
if p { app.primary_color_idx + 1 } else { app.secondary_color_idx + 1 }