Skip to content
Merged
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
1 change: 0 additions & 1 deletion Common/Net/URL.h
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,5 @@ class Url {
int port_;
};


std::string UriDecode(std::string_view sSrc);
std::string UriEncode(std::string_view sSrc);
4 changes: 4 additions & 0 deletions Common/Render/Text/draw_text_cocoa.mm
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,10 @@ void Destroy() {

// TODO: Share with other backends.
void TextDrawerCocoa::SetOrCreateFont(const FontStyle &style) {
if (style.sizePts <= 0) {
return;
}

auto iter = fontMap_.find(style);
if (iter != fontMap_.end()) {
fontStyle_ = style;
Expand Down
1 change: 1 addition & 0 deletions Common/System/System.h
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ enum SystemProperty {
SYSPROP_HAS_LOGIN_DIALOG,
SYSPROP_HAS_TEXT_CLIPBOARD,
SYSPROP_HAS_TEXT_INPUT_DIALOG, // Indicates that System_InputBoxGetString is available.
SYSPROP_HAS_DEEP_LINKS, // ios-style deep links

SYSPROP_CAN_CREATE_SHORTCUT,
SYSPROP_CAN_SHOW_FILE,
Expand Down
1 change: 1 addition & 0 deletions Common/UI/View.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1089,6 +1089,7 @@ const FontStyle *GetTextStyle(const UIContext &dc, TextSize size) {
default:
break;
}
_dbg_assert_(style->sizePts > 0);
return style;
}

Expand Down
2 changes: 2 additions & 0 deletions Core/HW/MemoryStick.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ void MemoryStick_SetState(MemStickState state) {
return;
}

INFO_LOG(Log::System, "Memory stick state changed: %d -> %d", memStickState, state);

memStickState = state;

// If removed, we unmount. Otherwise, mounting is delayed.
Expand Down
166 changes: 62 additions & 104 deletions Tools/langtool/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading