Skip to content

#256 Person outline and portrait styles works with old plantuml.jar versions too #266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 21, 2022
Merged

#256 Person outline and portrait styles works with old plantuml.jar versions too #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
106bc05
#256 Add plantuml.jar workaround and style actor after person
kirchsth Nov 20, 2022
4600368
#256 fix PR finding (missing person sprite in external_person legend)
kirchsth Nov 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions C4.puml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,15 @@ skinparam arrow {
FontSize 12
}

skinparam actor {
skinparam person {
StereotypeFontSize 12
shadowing false
style awesome
}

skinparam person {
skinparam actor {
StereotypeFontSize 12
shadowing false
style awesome
}

' Some boundary skinparams have to be set as package skinparams too (PlantUML uses internal packages)
Expand Down Expand Up @@ -330,9 +330,10 @@ skinparam package {
!$tagSkin = $elementTagSkinparams("rectangle", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
!$tagSkin = $tagSkin + $elementTagSkinparams("database", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, "")
!$tagSkin = $tagSkin + $elementTagSkinparams("queue", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, "")
' plantuml.jar bug - actor have to be after person
!$tagSkin = $tagSkin + $elementTagSkinparams("person", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, "")
' actor has style awesome, therefore $fontColor is ignored and text uses $bgColor too
!$tagSkin = $tagSkin + $elementTagSkinparams("actor", $tagStereo, $bgColor, $bgColor, $borderColor, $shadowing, "")
!$tagSkin = $tagSkin + $elementTagSkinparams("person", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, "")
!if (%strpos($tagStereo, "boundary") >= 0 && $bgColor != "")
!$tagSkin = $tagSkin + "skinparam package<<" + $tagStereo + ">>StereotypeFontColor " + $bgColor + %newline()
!$tagSkin = $tagSkin + "skinparam rectangle<<" + $tagStereo + ">>StereotypeFontColor " + $bgColor + %newline()
Expand Down
11 changes: 11 additions & 0 deletions C4_Context.puml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,13 +280,21 @@ endlegend
!global $defaultPersonSprite = "person"
!$dummy = $restoreEmpty("person", "sprite", $defaultPersonSprite, %true())
UpdateElementStyle("person")
' workaround of plantuml.jar bug - person overwrites external_person setting
!$dummy = $restoreEmpty("external_person", "sprite", $defaultPersonSprite, %true())
UpdateElementStyle("external_person")
!global $portraitPerson = "false"

!procedure $clearPersonRestore()
!$dummy = $clearRestore("person", "sprite")
!$dummy = $clearRestore("person", "legendSprite")
%set_variable_value("$" + "person" + "ElementTagSprite", "")
UpdateElementStyle("person")
' workaround of plantuml.jar bug - person overwrites external_person setting
!$dummy = $clearRestore("external_person", "sprite")
!$dummy = $clearRestore("external_person", "legendSprite")
%set_variable_value("$" + "external_person" + "ElementTagSprite", "")
UpdateElementStyle("external_person")
!endprocedure

!procedure HIDE_PERSON_SPRITE()
Expand All @@ -303,6 +311,9 @@ UpdateElementStyle("person")
!endif
!$dummy = $restoreEmpty("person", "sprite", $defaultPersonSprite, %true())
UpdateElementStyle("person")
' workaround of plantuml.jar bug - person overwrites external_person setting
!$dummy = $restoreEmpty("external_person", "sprite", $defaultPersonSprite, %true())
UpdateElementStyle("external_person")
!$portraitPerson = "false"
!endprocedure

Expand Down