hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-22 13:21:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Table diff colors (#1084)

Browse source
This commit is contained in:
Sebastian Stachowicz 2025-08-01 02:36:03 +00:00 • committed by GitHub
parent 9598553e5d
commit 3002d250a1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 33 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugin/src/App/Components/PatchVisualizer/DomLabel.lua
View file

@ -95,7 +95,7 @@ function DomLabel:render()
return Theme.with(function(theme)
local color = if props.isWarning
then theme.Diff.Warning
elseif props.patchType then theme.Diff[props.patchType]
elseif props.patchType then theme.Diff.Background[props.patchType]
else theme.TextColor
local indent = (depth - 1) * 12 + 15

4
plugin/src/App/Components/StringDiffVisualizer/init.lua
View file

@ -178,7 +178,7 @@ function StringDiffVisualizer:render()
size = UDim2.new(1, 0, 1, 0),
position = UDim2.new(0, 0, 0, 0),
text = oldString,
lineBackground = theme.Diff.Remove,
lineBackground = theme.Diff.Background.Remove,
markedLines = self.state.remove,
}),
}),
@ -193,7 +193,7 @@ function StringDiffVisualizer:render()
size = UDim2.new(1, 0, 1, 0),
position = UDim2.new(0, 0, 0, 0),
text = newString,
lineBackground = theme.Diff.Add,
lineBackground = theme.Diff.Background.Add,
markedLines = self.state.add,
}),
}),

2
plugin/src/App/Components/TableDiffVisualizer/Array.lua
View file

@ -93,7 +93,7 @@ function Array:render()
e("Frame", {
Size = UDim2.new(1, 0, 0, 25),
BackgroundTransparency = if patchType == "Remain" then 1 else self.props.transparency,
BackgroundColor3 = if patchType == "Remain" then theme.Diff.Row else theme.Diff[patchType],
BackgroundColor3 = theme.Diff.Background[patchType],
BorderSizePixel = 0,
LayoutOrder = i,
}, {

10
plugin/src/App/Components/TableDiffVisualizer/Dictionary.lua
View file

@ -91,9 +91,7 @@ function Dictionary:render()
LayoutOrder = order,
BorderSizePixel = 0,
BackgroundTransparency = if line.patchType == "Remain" then 1 else self.props.transparency,
BackgroundColor3 = if line.patchType == "Remain"
then theme.Diff.Row
else theme.Diff[line.patchType],
BackgroundColor3 = theme.Diff.Background[line.patchType],
}, {
DiffIcon = if line.patchType ~= "Remain"
then e("ImageLabel", {
@ -114,7 +112,7 @@ function Dictionary:render()
TextXAlignment = Enum.TextXAlignment.Left,
FontFace = theme.Font.Main,
TextSize = theme.TextSize.Body,
TextColor3 = theme.Settings.Setting.DescriptionColor,
TextColor3 = theme.Diff.Text[line.patchType],
TextTruncate = Enum.TextTruncate.AtEnd,
}),
OldValue = e("Frame", {
@ -125,7 +123,7 @@ function Dictionary:render()
e(DisplayValue, {
value = oldValue,
transparency = self.props.transparency,
textColor = theme.Settings.Setting.DescriptionColor,
textColor = theme.Diff.Text[line.patchType],
}),
}),
NewValue = e("Frame", {
@ -136,7 +134,7 @@ function Dictionary:render()
e(DisplayValue, {
value = newValue,
transparency = self.props.transparency,
textColor = theme.Settings.Setting.DescriptionColor,
textColor = theme.Diff.Text[line.patchType],
}),
}),
})