Merge branch 'main' into ime-support-2

This commit is contained in:
Antonio Scandurra 2022-07-22 16:03:38 +02:00
commit 7b009c8bbe
209 changed files with 1859 additions and 9740 deletions

View file

@ -2,7 +2,7 @@ use crate::OpenBrowser;
use gpui::{
elements::{MouseEventHandler, Text},
platform::CursorStyle,
Element, Entity, RenderContext, View,
Element, Entity, MouseButton, RenderContext, View,
};
use settings::Settings;
use workspace::StatusItemView;
@ -32,7 +32,7 @@ impl View for FeedbackLink {
.boxed()
})
.with_cursor_style(CursorStyle::PointingHand)
.on_click(|_, _, cx| {
.on_click(MouseButton::Left, |_, cx| {
cx.dispatch_action(OpenBrowser {
url: NEW_ISSUE_URL.into(),
})

View file

@ -251,7 +251,7 @@ pub fn initialize_workspace(
workspace.left_sidebar().update(cx, |sidebar, cx| {
sidebar.add_item(
"icons/folder-tree-solid-14.svg",
"icons/folder_tree_16.svg",
"Project Panel".to_string(),
project_panel.into(),
cx,
@ -259,7 +259,7 @@ pub fn initialize_workspace(
});
workspace.right_sidebar().update(cx, |sidebar, cx| {
sidebar.add_item(
"icons/contacts-solid-14.svg",
"icons/user_group_16.svg",
"Contacts Panel".to_string(),
contact_panel.into(),
cx,