Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-11 08:13:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1888663 - Improve macos textview disabled appearance r=gsvelto

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D207161
This commit is contained in:
Alex Franchuk 2024-04-11 15:34:44 +00:00
parent e0e15ff907
commit 891aca0322
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
toolkit/crashreporter/client/app/src/ui/macos/mod.rs
View File

@ -806,15 +806,31 @@ impl ViewRenderer {
}
} else if let Ok(text) = cocoa::NSText::try_from(view) {
let normally_editable = unsafe { text.isEditable() } == runtime::YES;
match &style.enabled {
Property::Static(e) => {
unsafe { text.setEditable_((*e && normally_editable).into()) };
let normally_selectable = unsafe { text.isSelectable() } == runtime::YES;
let set_enabled = move |enabled: bool| unsafe {
if !enabled {
let mut range = text.selectedRange();
range.length = 0;
text.setSelectedRange_(range);
}
text.setEditable_((enabled && normally_editable).into());
text.setSelectable_((enabled && normally_selectable).into());
text.setBackgroundColor_(if enabled {
cocoa::NSColor::textBackgroundColor()
} else {
cocoa::NSColor::windowBackgroundColor()
});
text.setTextColor_(if enabled {
cocoa::NSColor::textColor()
} else {
cocoa::NSColor::disabledControlTextColor()
});
};
match &style.enabled {
Property::Static(e) => set_enabled(*e),
Property::Binding(b) => {
b.on_change(move |&enabled| unsafe {
text.setEditable_((enabled && normally_editable).into());
});
unsafe { text.setEditable_((*b.borrow() && normally_editable).into()) };
b.on_change(move |&enabled| set_enabled(enabled));
set_enabled(*b.borrow());
}
Property::ReadOnly(_) => {
unimplemented!("ElementStyle::enabled doesn't support ReadOnly")
@ -1016,7 +1032,7 @@ fn render_element(
cocoa::NSAttributedStringKey,
cocoa::id,
>>::dictionaryWithObject_forKey_(
cocoa::NSColor::systemGrayColor().0 as u64,
cocoa::NSColor::placeholderTextColor().0 as u64,
cocoa::NSForegroundColorAttributeName.0 as u64,
),
);