Compare commits
6 Commits
caa261665f
...
v0.4.1
| Author | SHA1 | Date | |
|---|---|---|---|
| 39a591e732 | |||
| 07865dc85f | |||
| 868b6fdfe9 | |||
| 1c803ff9c1 | |||
| fdcf254891 | |||
| e23e794730 |
@@ -203,7 +203,10 @@ func (this *box) SetPadding (padding tomo.Inset) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (this *box) SetRole (role tomo.Role) {
|
func (this *box) SetRole (role tomo.Role) {
|
||||||
|
if this.role == role { return }
|
||||||
this.role = role
|
this.role = role
|
||||||
|
this.lastStyleNonce = -1
|
||||||
|
this.outer.recursiveReApply()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (this *box) SetDNDData (dat data.Data) {
|
func (this *box) SetDNDData (dat data.Data) {
|
||||||
|
|||||||
@@ -29,7 +29,10 @@ func (this *canvasBox) Invalidate () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (this *canvasBox) Draw (can canvas.Canvas) {
|
func (this *canvasBox) Draw (can canvas.Canvas) {
|
||||||
|
if can == nil { return }
|
||||||
this.box.Draw(can)
|
this.box.Draw(can)
|
||||||
this.userDrawer.Draw (
|
if this.userDrawer != nil {
|
||||||
can.SubCanvas(this.padding.Apply(this.innerClippingBounds)))
|
this.userDrawer.Draw (
|
||||||
|
can.SubCanvas(this.padding.Apply(this.innerClippingBounds)))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package xcanvas
|
package xcanvas
|
||||||
|
|
||||||
import "sort"
|
import "sort"
|
||||||
|
import "math"
|
||||||
import "image"
|
import "image"
|
||||||
import "github.com/jezek/xgbutil/xgraphics"
|
import "github.com/jezek/xgbutil/xgraphics"
|
||||||
|
|
||||||
@@ -158,12 +159,12 @@ func (this *pen) fillPolygon (c xgraphics.BGRA, points ...image.Point) {
|
|||||||
area = this.image.Bounds().Intersect(area)
|
area = this.image.Bounds().Intersect(area)
|
||||||
if area.Empty() { return }
|
if area.Empty() { return }
|
||||||
|
|
||||||
|
boundaries := make([]int, len(points))
|
||||||
context := fillingContext {
|
context := fillingContext {
|
||||||
image: this.image,
|
image: this.image,
|
||||||
color: this.fill,
|
color: this.fill,
|
||||||
min: area.Min.X,
|
min: area.Min.X,
|
||||||
max: area.Max.X,
|
max: area.Max.X,
|
||||||
boundaries: make([]int, len(points)),
|
|
||||||
points: points,
|
points: points,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -181,19 +182,19 @@ func (this *pen) fillPolygon (c xgraphics.BGRA, points ...image.Point) {
|
|||||||
(fPointY < fy && fPrevY >= fy) ||
|
(fPointY < fy && fPrevY >= fy) ||
|
||||||
(fPrevY < fy && fPointY >= fy)
|
(fPrevY < fy && fPointY >= fy)
|
||||||
if addboundary {
|
if addboundary {
|
||||||
context.boundaries[boundaryCount] = int (
|
boundaries[boundaryCount] = int(math.Round (
|
||||||
fPointX +
|
fPointX +
|
||||||
(fy - fPointY) /
|
(fy - fPointY) /
|
||||||
(fPrevY - fPointY) *
|
(fPrevY - fPointY) *
|
||||||
(fPrevX - fPointX))
|
(fPrevX - fPointX)))
|
||||||
boundaryCount ++
|
boundaryCount ++
|
||||||
}
|
}
|
||||||
prevPoint = point
|
prevPoint = point
|
||||||
}
|
}
|
||||||
|
|
||||||
// sort boundary list
|
// sort boundary list
|
||||||
cutBoundaries := context.boundaries[:boundaryCount]
|
context.boundaries = boundaries[:boundaryCount]
|
||||||
sort.Ints(cutBoundaries)
|
sort.Ints(context.boundaries)
|
||||||
|
|
||||||
// fill pixels between boundary pairs
|
// fill pixels between boundary pairs
|
||||||
if c.A == 255 {
|
if c.A == 255 {
|
||||||
@@ -215,7 +216,7 @@ type fillingContext struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (context *fillingContext) fillPolygonHotOpaque () {
|
func (context *fillingContext) fillPolygonHotOpaque () {
|
||||||
for index := 0; index < len(context.boundaries); index += 2 {
|
for index := 0; index < len(context.boundaries) - 1; index += 2 {
|
||||||
left := context.boundaries[index]
|
left := context.boundaries[index]
|
||||||
right := context.boundaries[index + 1]
|
right := context.boundaries[index + 1]
|
||||||
|
|
||||||
@@ -240,7 +241,7 @@ func (context *fillingContext) fillPolygonHotOpaque () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (context *fillingContext) fillPolygonHotTransparent () {
|
func (context *fillingContext) fillPolygonHotTransparent () {
|
||||||
for index := 0; index < len(context.boundaries); index += 2 {
|
for index := 0; index < len(context.boundaries) - 1; index += 2 {
|
||||||
left := context.boundaries[index]
|
left := context.boundaries[index]
|
||||||
right := context.boundaries[index + 1]
|
right := context.boundaries[index + 1]
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user