mdgriffith/elm-ui
1
1
Fork 0
mirror of https://github.com/mdgriffith/elm-ui.git synced 2024-11-22 11:52:09 +03:00
Code Issues Projects Releases Wiki Activity

resolves #65, resolves #199 - maintain padding as Float internally even if the interface is as Int

Browse Source
This commit is contained in:
mdgriffith 2020-05-18 22:57:41 -04:00
parent f4fc54d069
commit 4b1b3a77cb
2 changed files with 81 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/Element.elm
View File

@ -645,14 +645,34 @@ wrappedRow attrs children =
newPadding =
case padded of
Just (Internal.Padding name t r b l) ->
if r >= (x // 2) && b >= (y // 2) then
if r >= (toFloat x / 2) && b >= (toFloat y / 2) then
let
newTop =
t - (toFloat y / 2)
newRight =
r - (toFloat x / 2)
newBottom =
b - (toFloat y / 2)
newLeft =
l - (toFloat x / 2)
in
Just <|
paddingEach
{ top = t - (y // 2)
, right = r - (x // 2)
, bottom = b - (y // 2)
, left = l - (x // 2)
}
Internal.StyleClass Flag.padding
(Internal.PaddingStyle
(Internal.paddingNameFloat
newTop
newRight
newBottom
newLeft
)
newTop
newRight
newBottom
newLeft
)
else
Nothing
@ -1343,7 +1363,11 @@ moveLeft x =
{-| -}
padding : Int -> Attribute msg
padding x =
Internal.StyleClass Flag.padding (Internal.PaddingStyle ("p-" ++ String.fromInt x) x x x x)
let
f =
toFloat x
in
Internal.StyleClass Flag.padding (Internal.PaddingStyle ("p-" ++ String.fromInt x) f f f f)
{-| Set horizontal and vertical padding.
@ -1351,16 +1375,27 @@ padding x =
paddingXY : Int -> Int -> Attribute msg
paddingXY x y =
if x == y then
Internal.StyleClass Flag.padding (Internal.PaddingStyle ("p-" ++ String.fromInt x) x x x x)
let
f =
toFloat x
in
Internal.StyleClass Flag.padding (Internal.PaddingStyle ("p-" ++ String.fromInt x) f f f f)
else
let
xFloat =
toFloat x
yFloat =
toFloat y
in
Internal.StyleClass Flag.padding
(Internal.PaddingStyle
("p-" ++ String.fromInt x ++ "-" ++ String.fromInt y)
y
x
y
x
yFloat
xFloat
yFloat
xFloat
)
@ -1381,16 +1416,26 @@ And then just do
paddingEach : { top : Int, right : Int, bottom : Int, left : Int } -> Attribute msg
paddingEach { top, right, bottom, left } =
if top == right && top == bottom && top == left then
Internal.StyleClass Flag.padding (Internal.PaddingStyle ("p-" ++ String.fromInt top) top top top top)
let
topFloat =
toFloat top
in
Internal.StyleClass Flag.padding
(Internal.PaddingStyle ("p-" ++ String.fromInt top)
topFloat
topFloat
topFloat
topFloat
)
else
Internal.StyleClass Flag.padding
(Internal.PaddingStyle
(Internal.paddingName top right bottom left)
top
right
bottom
left
(toFloat top)
(toFloat right)
(toFloat bottom)
(toFloat left)
)

24
src/Internal/Model.elm
View File

@ -79,6 +79,7 @@ module Internal.Model exposing
, onlyStyles
, optionsToRecord
, paddingName
, paddingNameFloat
, pageClass
, paragraphClass
, reduceRecursive
@ -173,7 +174,7 @@ type Style
| Colored String String Color
| SpacingStyle String Int Int
| BorderWidth String Int Int Int Int
| PaddingStyle String Int Int Int Int
| PaddingStyle String Float Float Float Float
| GridTemplateStyle
{ spacing : ( Length, Length )
, columns : List Length
@ -1945,7 +1946,7 @@ type Spacing
type Padding
= Padding String Int Int Int Int
= Padding String Float Float Float Float
extractSpacingAndPadding : List (Attribute aligned msg) -> ( Maybe Padding, Maybe Spacing )
@ -2856,13 +2857,13 @@ renderStyleRule options rule maybePseudo =
maybePseudo
class
[ Property "padding"
(String.fromInt top
(String.fromFloat top
++ "px "
++ String.fromInt right
++ String.fromFloat right
++ "px "
++ String.fromInt bottom
++ String.fromFloat bottom
++ "px "
++ String.fromInt left
++ String.fromFloat left
++ "px"
)
]
@ -3192,6 +3193,17 @@ paddingName top right bottom left =
++ String.fromInt left
paddingNameFloat top right bottom left =
"pad-"
++ floatClass top
++ "-"
++ floatClass right
++ "-"
++ floatClass bottom
++ "-"
++ floatClass left
getStyleName : Style -> String
getStyleName style =
case style of