obsidian-plugin/silvanocerza_github-gitless-sync
1
0
Fork 0
mirror of https://github.com/silvanocerza/github-gitless-sync.git synced 2026-07-22 12:10:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix action buttons spanning multiple lines not being shown

Browse source
This commit is contained in:
Silvano Cerza 2025-02-20 19:20:15 +01:00
parent aae730f0f1
commit 6c369232e3
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/views/conflicts-resolution/actions-gutter.tsx
View file

@ -94,16 +94,19 @@ const ActionsGutter: React.FC<ActionsGutterProps> = ({
buttons = ( buttons = (
<foreignObject <foreignObject
x={0} x={0}
y={topLeft} y={Math.min(topLeft, topRight)}
width={actualWidth} width={actualWidth}
height={bottomRight - topLeft + 24} height={
Math.max(bottomRight, bottomLeft) - Math.min(topLeft, topRight) + 24
}
> >
<div style={{ position: "relative", height: "100%" }}> <div style={{ position: "relative", height: "100%" }}>
<div <div
style={{ style={{
position: "absolute", position: "absolute",
left: 0, left: 0,
top: lineHeight / 2 - 12, top:
topLeft - Math.min(topLeft, topRight) + lineHeight / 2 - 12,
}} }}
> >
<ButtonRightArrow <ButtonRightArrow
@ -115,7 +118,8 @@ const ActionsGutter: React.FC<ActionsGutterProps> = ({
style={{ style={{
position: "absolute", position: "absolute",
right: 0, right: 0,
top: topRight - topLeft + lineHeight / 2 - 12, top:
topRight - Math.min(topLeft, topRight) + lineHeight / 2 - 12,
}} }}
> >
<ButtonLeftArrow <ButtonLeftArrow