diff --git a/cmd/asciigen/draw.go b/cmd/asciigen/draw.go index 057d0e8..d4929e5 100644 --- a/cmd/asciigen/draw.go +++ b/cmd/asciigen/draw.go @@ -93,16 +93,10 @@ func Draw( // Padding to center key padding := (key.NewW - len(keyStr)) / 2 - if padding == 0 { + if padding <= 0 { padding = 1 } - keyWidthLimit := key.NewW - padding - - if len(keyStr) > keyWidthLimit { - keyStr = keyStr[:keyWidthLimit] - } - for i := key.NewY; i < key.NewY+key.NewH; i++ { for j := key.NewX; j < key.NewX+key.NewW; j++ { if i == key.NewY { @@ -115,12 +109,8 @@ func Draw( // Write key in the middle if j == key.NewX { table[i][j] = "|" - } else if j > key.NewX+padding && j <= key.NewX+len(keyStr)+padding { - if j == key.NewX+padding+1 { - table[i][j] = keyStr - } else { - table[i][j] = "" - } + } else if j > key.NewX+padding && j < key.NewX+len(keyStr)+padding+1 && j <= key.NewX+key.NewW-padding { + table[i][j] = string(keyStr[j-key.NewX-padding-1]) } else { table[i][j] = " " } diff --git a/dztech_dz60rgb_wkl/asciiart/haunt98.txt b/dztech_dz60rgb_wkl/asciiart/haunt98.txt index eb7f88c..d86ea17 100644 --- a/dztech_dz60rgb_wkl/asciiart/haunt98.txt +++ b/dztech_dz60rgb_wkl/asciiart/haunt98.txt @@ -27,10 +27,10 @@ +-----------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-----------+ | | | | | | | | | | | | | | | +-------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-----------------+ -| CAPSLOCK | RGB_HUI| RGB_SAI| RGB_VAI| | | | | HOME | PGUP | | | | +| CAPSLOCK | RGB_HU| RGB_SA| RGB_VA| | | | | HOME | PGUP | | | | +-----------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------------+-------+ | | | | | | | | | END | PGDN | | | | +-----------+-------+-----------+-------------------------------------------------------+-----------+-------+-----------+ -| | | | | RGB_TOG | RGB_MOD| | +| | | | | RGB_TOG | RGB_MO| | +-----------+-------+-----------+-------------------------------------------------------+-----------+-------+-----------+