mirror of
https://github.com/xiaoqidun/ofdgo.git
synced 2026-10-30 01:27:26 +08:00
This commit is contained in:
1 parent
2cc6c121f8
commit
7f79d1e70a
18 files changed
+757
-129
No files matched your search
@@ -87,7 +87,7 @@ func (e *Editor) resolveEditorStyle(object GraphicObject, layer string) (Graphic
|
||||
obj.FillColor, obj.StrokeColor = style.FillColor, style.StrokeColor
|
||||
}
|
||||
for _, color := range []*FillColor{style.FillColor, (*FillColor)(style.StrokeColor)} {
|
||||
if err := creationColor(color); err != nil {
|
||||
if err := e.editorColor(color); err != nil {
|
||||
return GraphicObject{}, &EditError{Code: EditUnsupportedColor, Err: fmt.Errorf("unsupported draw parameter color: %w", err)}
|
||||
}
|
||||
}
|
||||
@@ -103,7 +103,7 @@ type ObjectStyle struct {
|
||||
Join *string
|
||||
}
|
||||
|
||||
// StyleObjects 原子更新文字、图片和路径透明度,路径另支持描边样式
|
||||
// StyleObjects 原子更新文字、图片、路径与复合对象透明度,路径另支持描边样式
|
||||
// 入参: page 页面索引, ids 对象标识, style 待修改属性
|
||||
// 返回: error 错误信息
|
||||
func (e *Editor) StyleObjects(page int, ids []string, style ObjectStyle) error {
|
||||
@@ -129,6 +129,10 @@ func (e *Editor) StyleObjects(page int, ids []string, style ObjectStyle) error {
|
||||
if style.Alpha != nil {
|
||||
object.ImageObject.Alpha = style.Alpha
|
||||
}
|
||||
case "CompositeObject", "CompositeGraphicUnit":
|
||||
if style.Alpha != nil {
|
||||
object.CompositeGraphicUnit.Alpha = style.Alpha
|
||||
}
|
||||
case "PathObject":
|
||||
path := &object.PathObject
|
||||
if style.Alpha != nil {
|
||||
@@ -208,7 +212,7 @@ func (e *Editor) CopyStyle(page int, ids []string, source GraphicObject) error {
|
||||
return err
|
||||
}
|
||||
for _, color := range []*FillColor{from.FillColor, (*FillColor)(from.StrokeColor)} {
|
||||
if err := creationColor(color); err != nil {
|
||||
if err := e.editorColor(color); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user