Skip to content

Commit

Permalink
line space -> Row Spacing
Browse files Browse the repository at this point in the history
  • Loading branch information
Tuller committed Sep 22, 2024
1 parent 901f385 commit 70111a2
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 12 deletions.
10 changes: 5 additions & 5 deletions Dominos/core/buttonBar.lua
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,13 @@ function ButtonBar:GetRowOffset()
return self.sets.rowOffset or 0
end

function ButtonBar:SetLineSpace(lineSpace)
self.sets.lineSpace = lineSpace
function ButtonBar:SetRowSpacing(rowSpacing)
self.sets.rowSpacing = rowSpacing
self:Layout()
end

function ButtonBar:GetLineSpace()
return self.sets.lineSpace or 0
function ButtonBar:GetRowSpacing()
return self.sets.rowSpacing or 0
end

-- the wackiness here is for backward compaitbility reasons, since I did not
Expand Down Expand Up @@ -224,7 +224,7 @@ function ButtonBar:Layout()
local pW, pH = self:GetPadding()
local spacing = self:GetSpacing()
local rowOffset = self:GetRowOffset()
local lineSpace = self:GetLineSpace()
local lineSpace = self:GetRowSpacing()

local buttonWidth = bW + spacing
local buttonHeight = bH + spacing
Expand Down
2 changes: 1 addition & 1 deletion Dominos_Config/localization/localization.cn.lua
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ L.RCUToT = '目标的目标'
L.ResetProfile = '重置配置...'
L.RightClickUnit = '右键点击'
L.RowOffset = "列偏移"
L.LineSpace = "行间距"
L.RowSpacing = "行间距"
L.Save = '新建'
L.Scale = '缩放'
L.SelfcastKey = '自我施法按键'
Expand Down
2 changes: 1 addition & 1 deletion Dominos_Config/localization/localization.lua
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ L.RCUToT = "Target of Target"
L.ResetProfile = "Reset Profile..."
L.RightClickUnit = "Right Click Target"
L.RowOffset = "Row Offset"
L.LineSpace = "Line Space"
L.RowSpacing = "Row Spacing"
L.Save = _G.SAVE
L.Scale = "Scale"
L.SelfcastKey = "Selfcast Key"
Expand Down
10 changes: 5 additions & 5 deletions Dominos_Config/widgets/panel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -344,9 +344,9 @@ function Panel:NewRowOffsetSlider()
}
end

function Panel:NewLineSpaceSlider()
function Panel:NewRowSpacingSlider()
return self:NewSlider{
name = L.LineSpace,
name = L.RowSpacing,

min = function()
return -(Round(ActionButton1:GetHeight()) + self.owner:GetSpacing())
Expand All @@ -359,11 +359,11 @@ function Panel:NewLineSpaceSlider()
softLimits = true,

get = function()
return self.owner:GetLineSpace()
return self.owner:GetRowSpacing()
end,

set = function(_, value)
self.owner:SetLineSpace(value)
self.owner:SetRowSpacing(value)
end
}
end
Expand Down Expand Up @@ -506,7 +506,7 @@ function Panel:AddLayoutOptions()
self.colsSlider = self:NewColumnsSlider()
self.spacingSlider = self:NewSpacingSlider()
self.rowOffsetSlider = self:NewRowOffsetSlider()
self.lineHeightSlider = self:NewLineSpaceSlider()
self.rowSpacingSlider = self:NewRowSpacingSlider()
self:AddBasicLayoutOptions()
end

Expand Down
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Dominos Changelog

## 11.0.4

* Add a new slider for row spacing (contributed by [Xiaoyang-Huang](https://github.com/Xiaoyang-Huang))

## 11.0.3

* Add support for classic versions 4.4.1 and 1.15.4
Expand Down

0 comments on commit 70111a2

Please sign in to comment.