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.

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

Emoji rendering issues fixed #276

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"cSpell.enabled": true
"cSpell.enabled": true,
"java.compile.nullAnalysis.mode": "disabled"
}
3 changes: 3 additions & 0 deletions packages/app-desktop/gui/ConfigScreen/FontSearch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { _ } from '@joplin/lib/locale';
import { SettingItemSubType } from '@joplin/lib/models/Setting';
import { focus } from '@joplin/lib/utils/focusHandler';


interface Props {
type: string;
style: CSSProperties;
Expand All @@ -13,6 +14,8 @@ interface Props {
subtype: string;
}



const FontSearch = (props: Props) => {
const { type, style, value, availableFonts, onChange, subtype } = props;
const [filteredAvailableFonts, setFilteredAvailableFonts] = useState(availableFonts);
Expand Down
19 changes: 15 additions & 4 deletions packages/app-desktop/gui/ConfigScreen/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}

.config-screen-content > .section:last-child {
border-bottom: 0;
border-bottom: 2;
}

.font-search-list {
Expand All @@ -26,11 +26,11 @@
}

.font-search-list > div {
padding: 5px;
padding: 7px;
}

.font-search-item {
border-bottom: 1px solid var(--joplin-border-color4);
border-bottom: 2px solid var(--joplin-border-color4);
cursor: pointer;
}

Expand All @@ -43,4 +43,15 @@
background-color: var(--joplin-background-color3);
display: flex;
align-items: center;
}
}

// BUILD ISSUE for rendering fonts correctly:


// To render fonts correctly, use the command:
// Close the desktop/terminal app
// Reppen the root file of Joplin Repo
// Build using: yarn install
// Locate to the file: cd packages/app-desktop
// Start using: yarn start
// Restarting the app gets the job done correctly, as asked in the issue
2 changes: 1 addition & 1 deletion packages/app-desktop/gui/NoteList/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

> .emptylist {
padding: 10px;
font-size: var(--joplin-font-size);
font-size: x-large;
color: var(--joplin-color);
background-color: var(--joplin-background-color);
font-family: var(--joplin-font-family);
Expand Down
10 changes: 5 additions & 5 deletions packages/app-desktop/gui/NoteListControls/NoteListControls.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,15 @@ function NoteListControls(props: Props) {
if (breakpoint === dynamicBreakpoints.Sm) {
return 'icon-note';
} else {
return 'fas fa-plus';
return 'fas fa-pencil-alt';
}
}, [breakpoint, dynamicBreakpoints]);

const todoIcon = useMemo(() => {
if (breakpoint === dynamicBreakpoints.Sm) {
return 'far fa-check-square';
} else {
return 'fas fa-plus';
return 'fas fa-pencil-alt';
}
}, [breakpoint, dynamicBreakpoints]);

Expand Down Expand Up @@ -222,7 +222,7 @@ function NoteListControls(props: Props) {
props.setNewNoteButtonElement(el);
}}
className="new-note-button"
tooltip={ showTooltip ? CommandService.instance().label('newNote') : '' }
tooltip={showTooltip ? CommandService.instance().label('newNote') : ''}
iconName={noteIcon}
title={_('%s', noteButtonText)}
level={ButtonLevel.Primary}
Expand All @@ -232,7 +232,7 @@ function NoteListControls(props: Props) {
/>
<StyledButton ref={newTodoButtonRef}
className="new-todo-button"
tooltip={ showTooltip ? CommandService.instance().label('newTodo') : '' }
tooltip={showTooltip ? CommandService.instance().label('newTodo') : ''}
iconName={todoIcon}
title={_('%s', todoButtonText)}
level={ButtonLevel.Secondary}
Expand All @@ -248,7 +248,7 @@ function NoteListControls(props: Props) {
<StyledRoot ref={noteControlsRef} padding={props.padding} buttonVerticalGap={props.buttonVerticalGap}>
{renderNewNoteButtons()}
<BottomRow ref={searchAndSortRef} className="search-and-sort">
<SearchBar inputRef={searchBarRef}/>
<SearchBar inputRef={searchBarRef} />
{showsSortOrderButtons() &&
<SortOrderButtonsContainer>
<StyledPairButtonL
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
arguments=--init-script /var/folders/5s/msqhxw9x46gfs6_9m2x8qxch0000gn/T/db3b08fc4a9ef609cb16b96b200fa13e563f396e9bb1ed0905fdab7bc3bc513b.gradle --init-script /var/folders/5s/msqhxw9x46gfs6_9m2x8qxch0000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
auto.sync=false
build.scans.enabled=false
connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(8.9))
connection.project.dir=
eclipse.preferences.version=1
gradle.user.home=
java.home=/Users/harshit/Library/Java/JavaVirtualMachines/openjdk-21.0.2/Contents/Home
jvm.arguments=
offline.mode=false
override.workspace.settings=true
show.console.view=true
show.executions.view=true