Skip to content

Rework the high contrast accessibility feature #265

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

Merged
merged 1 commit into from
Apr 8, 2022
Merged

Rework the high contrast accessibility feature #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions shell/platform/tizen/accessibility_settings.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ AccessibilitySettings::AccessibilitySettings(FlutterTizenEngine* engine)
SYSTEM_SETTINGS_KEY_MENU_SYSTEM_ACCESSIBILITY_HIGHCONTRAST),
&high_contrast_enabled);
if (result == SYSTEM_SETTINGS_ERROR_NONE) {
engine_->EnableAccessibilityFeature(high_contrast_enabled);
engine_->UpdateAccessibilityFeatures(false, high_contrast_enabled);
} else {
FT_LOG(Error) << "Failed to get value of accessibility high contrast.";
}
Expand Down Expand Up @@ -79,7 +79,7 @@ void AccessibilitySettings::OnHighContrastStateChanged(
return;
}

self->engine_->EnableAccessibilityFeature(enabled);
self->engine_->UpdateAccessibilityFeatures(false, enabled);
#endif
}

Expand Down
25 changes: 7 additions & 18 deletions shell/platform/tizen/flutter_tizen_engine.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,26 +485,15 @@ bool FlutterTizenEngine::MarkExternalTextureFrameAvailable(int64_t texture_id) {
engine_, texture_id) == kSuccess);
}

// Set bold font when accessibility high contrast state is
// changed.
void FlutterTizenEngine::EnableAccessibilityFeature(bool bold_text) {
if (engine_ == nullptr) {
return;
}

if (bold_text) {
embedder_api_.UpdateAccessibilityFeatures(
engine_, kFlutterAccessibilityFeatureBoldText);
} else {
embedder_api_.UpdateAccessibilityFeatures(engine_,
FlutterAccessibilityFeature(0));
}
void FlutterTizenEngine::UpdateAccessibilityFeatures(bool invert_colors,
bool high_contrast) {
int32_t flags = 0;
flags |= invert_colors ? kFlutterAccessibilityFeatureInvertColors : 0;
flags |= high_contrast ? kFlutterAccessibilityFeatureHighContrast : 0;
embedder_api_.UpdateAccessibilityFeatures(engine_,
FlutterAccessibilityFeature(flags));
}

// The Flutter Engine calls out to this function when new platform messages
// are available.

// Converts a FlutterPlatformMessage to an equivalent FlutterDesktopMessage.
FlutterDesktopMessage FlutterTizenEngine::ConvertToDesktopMessage(
const FlutterPlatformMessage& engine_message) {
FlutterDesktopMessage message = {};
Expand Down
5 changes: 3 additions & 2 deletions shell/platform/tizen/flutter_tizen_engine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,15 +186,16 @@ class FlutterTizenEngine : public TizenRenderer::Delegate {
void SetSemanticsEnabled(bool enabled);
#endif

// Set bold font when accessibility high contrast state is changed.
void EnableAccessibilityFeature(bool bold_text);
// Notifies the engine about enabled accessibility features.
void UpdateAccessibilityFeatures(bool invert_colors, bool high_contrast);

private:
friend class EngineModifier;

// Whether the engine is running in headed or headless mode.
bool IsHeaded() { return renderer_ != nullptr; }

// Converts a FlutterPlatformMessage to an equivalent FlutterDesktopMessage.
FlutterDesktopMessage ConvertToDesktopMessage(
const FlutterPlatformMessage& engine_message);

Expand Down