luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix

Browse source
This commit is contained in:
Alexander Wang 2023-03-16 10:48:54 -07:00
parent 26d680a052
commit 64836ce827
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
d2graph/d2graph.go
View file

@ -505,11 +505,8 @@ func (obj *Object) Text() *d2target.MText {
} }
fontSize := d2fonts.FONT_SIZE_M fontSize := d2fonts.FONT_SIZE_M
labelVal := obj.Attributes.Label.Value
if obj.Class != nil || obj.SQLTable != nil { if obj.Class != nil || obj.SQLTable != nil {
fontSize = d2fonts.FONT_SIZE_L fontSize = d2fonts.FONT_SIZE_L
} else if obj.Graph.Theme != nil && obj.Graph.Theme.SpecialRules.CapsLock {
labelVal = strings.ToUpper(labelVal)
} }
if obj.OuterSequenceDiagram() == nil { if obj.OuterSequenceDiagram() == nil {
@ -530,7 +527,7 @@ func (obj *Object) Text() *d2target.MText {
isBold = false isBold = false
} }
return &d2target.MText{ return &d2target.MText{
Text: labelVal, Text: obj.Attributes.Label.Value,
FontSize: fontSize, FontSize: fontSize,
IsBold: isBold, IsBold: isBold,
IsItalic: isItalic, IsItalic: isItalic,
@ -1443,9 +1440,15 @@ func (g *Graph) SetDimensions(mtexts []*d2target.MText, ruler *textmeasure.Ruler
func (g *Graph) Texts() []*d2target.MText { func (g *Graph) Texts() []*d2target.MText {
var texts []*d2target.MText var texts []*d2target.MText
capsLock := g.Theme != nil && g.Theme.SpecialRules.CapsLock
for _, obj := range g.Objects { for _, obj := range g.Objects {
if obj.Attributes.Label.Value != "" { if obj.Attributes.Label.Value != "" {
texts = appendTextDedup(texts, obj.Text()) text := obj.Text()
if capsLock && obj.Class == nil && obj.SQLTable == nil {
text.Text = strings.ToUpper(text.Text)
}
texts = appendTextDedup(texts, text)
} }
if obj.Class != nil { if obj.Class != nil {
fontSize := d2fonts.FONT_SIZE_L fontSize := d2fonts.FONT_SIZE_L
@ -1472,6 +1475,10 @@ func (g *Graph) Texts() []*d2target.MText {
} }
for _, edge := range g.Edges { for _, edge := range g.Edges {
if edge.Attributes.Label.Value != "" { if edge.Attributes.Label.Value != "" {
text := edge.Text()
if capsLock {
text.Text = strings.ToUpper(text.Text)
}
texts = appendTextDedup(texts, edge.Text()) texts = appendTextDedup(texts, edge.Text())
} }
if edge.SrcArrowhead != nil && edge.SrcArrowhead.Label.Value != "" { if edge.SrcArrowhead != nil && edge.SrcArrowhead.Label.Value != "" {