Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

placement of folder name on desktop #5281

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

placement of folder name on desktop #5281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba092da
placement of folder name on desktop
bunsenstraat Oct 14, 2024
d88edc7
lint
bunsenstraat Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libs/remix-ui/workspace/src/lib/components/electron-menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export const ElectronMenu = () => {
>
<div className="recentfolder pb-1">
<span onClick={async () => { await openFolderElectron(folder) }} className="pl-2 recentfolder_name pr-2">{lastFolderName(folder)}</span>
<span onClick={async () => { await openFolderElectron(folder) }} data-id={{ folder }} className="recentfolder_path pr-2">{folder}</span>
<span onClick={async () => { await openFolderElectron(folder) }} data-id={`recent_folder_${folder}`} className="recentfolder_path pr-2">{folder}</span>
<i
onClick={() => {
global.dispatchRemoveRecentFolder(folder)
Expand Down
11 changes: 9 additions & 2 deletions libs/remix-ui/workspace/src/lib/components/electron-workspace-name.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,21 @@ export const ElectronWorkspaceName = (props: ElectronWorkspaceNameProps) => {

return (
(dir === undefined || dir === '') ? <></> :
<div className="d-flex align-items-baseline">
<div className="d-flex align-items-baseline mt-2">
<CustomTooltip
placement="bottom"
tooltipId="workspace-name"
tooltipClasses="text-nowrap"
tooltipText={dir}
>
<div>{parsePath()}</div>
<div
style={{
overflow: 'hidden',
textOverflow: 'ellipsis',
flexGrow: 1,
}}

>{parsePath()}</div>
</CustomTooltip>
<CustomTooltip
placement="top"
Expand Down
4 changes: 2 additions & 2 deletions libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,7 @@ export function Workspace() {
<span className="d-flex">
<label className="pl-2 form-check-label" style={{ wordBreak: 'keep-all' }}>
{(platform == appPlatformTypes.desktop) ? (
<ElectronWorkspaceName plugin={global.plugin} path={global.fs.browser.currentLocalFilePath} />
null
) : <FormattedMessage id='filePanel.workspace' />}
</label>
{selectedWorkspace && selectedWorkspace.name === 'code-sample' && <CustomTooltip
Expand Down Expand Up @@ -1143,7 +1143,7 @@ export function Workspace() {
)}
</Dropdown.Menu>
</Dropdown>
):null}
):<ElectronWorkspaceName plugin={global.plugin} path={global.fs.browser.currentLocalFilePath} />}
</div>
</div>
</header>
Expand Down
Loading