Skip to content

Commit 4e6c2c5

Browse files
authored
Merge branch 'master' into edward/war-7378-use-forkpoint-commit
2 parents dc8f3de + d24408f commit 4e6c2c5

1 file changed

Lines changed: 6 additions & 8 deletions

File tree

  • app/src/workspace/view/conversation_list

app/src/workspace/view/conversation_list/item.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -312,16 +312,14 @@ pub fn render_item(props: ItemProps<'_>, app: &AppContext) -> Box<dyn Element> {
312312
Some(button_style),
313313
appearance,
314314
);
315-
let (parent_anchor, child_anchor, offset_x) = if tooltip_opens_right {
316-
(ParentAnchor::TopRight, ChildAnchor::TopRight, -8.)
317-
} else {
318-
(ParentAnchor::TopLeft, ChildAnchor::TopLeft, 8.)
319-
};
315+
// The kebab button is pinned to the right edge of the item regardless of which
316+
// side of the screen the conversation list panel is on; only the menu's open
317+
// direction (handled above) flips with `tooltip_opens_right`.
320318
let overflow_offset = OffsetPositioning::offset_from_parent(
321-
vec2f(offset_x, 6.),
319+
vec2f(-8., 6.),
322320
ParentOffsetBounds::ParentByPosition,
323-
parent_anchor,
324-
child_anchor,
321+
ParentAnchor::TopRight,
322+
ChildAnchor::TopRight,
325323
);
326324
// Use add_positioned_child (not overlay) so button stays within item bounds
327325
stack.add_positioned_child(overflow_button.finish(), overflow_offset);

0 commit comments

Comments
 (0)