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

Fix buttons positioning in case the ribbons spans multiple lines

Browse source
This commit is contained in:
Silvano Cerza 2025-02-20 19:04:47 +01:00
parent fd100345a3
commit 2dcbd11ed0
1 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,7 +54,7 @@ const ActionsGutter: React.FC<ActionsGutterProps> = ({
buttons = (
<foreignObject
x={actualWidth - 48}
y={topLeft + lineHeight / 2 - 12}
y={topRight + lineHeight / 2 - 12}
width="48"
height="24"
>
@ -94,25 +94,35 @@ const ActionsGutter: React.FC<ActionsGutterProps> = ({
buttons = (
<foreignObject
x={0}
y={topLeft + lineHeight / 2 - 12}
y={topLeft}
width={actualWidth}
height="24"
height={bottomRight - topLeft + 24}
>
<div
style={{
display: "flex",
flexDirection: "row",
justifyContent: "space-between",
}}
>
<ButtonRightArrow
tooltipText="Overwrite right lines"
onClick={() => onAcceptRight(chunk)}
/>
<ButtonLeftArrow
tooltipText="Overwrite left lines"
onClick={() => onAcceptLeft(chunk)}
/>
<div style={{ position: "relative", height: "100%" }}>
<div
style={{
position: "absolute",
left: 0,
top: lineHeight / 2 - 12,
}}
>
<ButtonRightArrow
tooltipText="Overwrite right lines"
onClick={() => onAcceptRight(chunk)}
/>
</div>
<div
style={{
position: "absolute",
right: 0,
top: topRight - topLeft + lineHeight / 2 - 12,
}}
>
<ButtonLeftArrow
tooltipText="Overwrite left lines"
onClick={() => onAcceptLeft(chunk)}
/>
</div>
</div>
</foreignObject>
);