mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 02:06:01 +02:00
Code Issues Wiki Activity

Bug 576090: Fix Preference description for preference

Browse source 
The description for Advanced Content Assist Preference can not be read
out.

The description can  not be a stand-alone label when working with JAWS,
and titles on the page should have additional accessibility listener
values for Advanced Content Assist Preference can not be read out.

Change-Id: Ic7715676848ecefb8cf111800a2847fe6e3e30aa
Reported-by: Gerald Mitchell <Gerald.Mitchell@ibm.com>
Signed-off-by: Gerald Mitchell <Gerald.Mitchell@ibm.com>
This commit is contained in:
GeraldMit 2021-09-19 23:39:55 -04:00 • committed by Gerald Mitchell
parent 327c3c7116
commit 174453ba91
1 changed files with 39 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2005, 2016 IBM Corporation and others. * Copyright (c) 2005, 2021 IBM Corporation and others.
* *
* This program and the accompanying materials * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0 * are made available under the terms of the Eclipse Public License 2.0
@ -56,6 +56,9 @@ import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.ViewerComparator; import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.accessibility.AccessibleAdapter;
import org.eclipse.swt.accessibility.AccessibleEvent;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.GC;
@ -155,7 +158,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo
} }
} }
private final Comparator<ModelElement> fCategoryComparator = new Comparator<ModelElement>() { private final Comparator<ModelElement> fCategoryComparator = new Comparator<>() {
@Override @Override
public int compare(ModelElement o1, ModelElement o2) { public int compare(ModelElement o1, ModelElement o2) {
return o1.getRank() - o2.getRank(); return o1.getRank() - o2.getRank();
@ -419,6 +422,21 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo
textField.setToolTipText(toolTip); textField.setToolTipText(toolTip);
} }
private StyledText createAccessibleLabelUsingStyledText(Composite composite, int style, String value) {
StyledText styledTextWidget = new StyledText(composite, SWT.SINGLE | SWT.NONE);
styledTextWidget.setText(value);
styledTextWidget.setEditable(false);
styledTextWidget.setCaret(null);
styledTextWidget.setBackground(composite.getBackground());
styledTextWidget.getAccessible().addAccessibleListener(new AccessibleAdapter() {
@Override
public void getDescription(AccessibleEvent e) {
e.result = value;
}
});
return styledTextWidget;
}
private void createDefaultLabel(Composite composite, int h_span) { private void createDefaultLabel(Composite composite, int h_span) {
final ICommandService commandSvc = PlatformUI.getWorkbench().getAdapter(ICommandService.class); final ICommandService commandSvc = PlatformUI.getWorkbench().getAdapter(ICommandService.class);
final Command command = commandSvc.getCommand(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS); final Command command = commandSvc.getCommand(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
@ -430,16 +448,16 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo
PixelConverter pixelConverter = new PixelConverter(composite); PixelConverter pixelConverter = new PixelConverter(composite);
int width = pixelConverter.convertWidthInCharsToPixels(40); int width = pixelConverter.convertWidthInCharsToPixels(40);
Label label = new Label(composite, SWT.NONE | SWT.WRAP); StyledText pageDescription = createAccessibleLabelUsingStyledText(composite, SWT.NONE | SWT.WRAP,
label.setText(Messages.format(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_page_description, Messages.format(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_page_description,
new Object[] { key })); new Object[] { key }));
GridData gd = new GridData(GridData.FILL, GridData.FILL, true, false, h_span, 1); GridData gd = new GridData(GridData.FILL, GridData.FILL, true, false, h_span, 1);
gd.widthHint = width; gd.widthHint = width;
label.setLayoutData(gd); pageDescription.setLayoutData(gd);
createFiller(composite, h_span); createFiller(composite, h_span);
label = new Label(composite, SWT.NONE | SWT.WRAP); Label label = new Label(composite, SWT.NONE | SWT.WRAP);
label.setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_default_table_description); label.setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_default_table_description);
gd = new GridData(GridData.FILL, GridData.FILL, true, false, h_span, 1); gd = new GridData(GridData.FILL, GridData.FILL, true, false, h_span, 1);
gd.widthHint = width; gd.widthHint = width;
@ -471,6 +489,13 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo
} }
}); });
fDefaultViewer.getControl().getAccessible().addAccessibleListener(new AccessibleAdapter() {
@Override
public void getName(AccessibleEvent e) {
e.result = PreferencesMessages.CodeAssistAdvancedConfigurationBlock_default_table_description;
}
});
fDefaultViewer.setContentProvider(ArrayContentProvider.getInstance()); fDefaultViewer.setContentProvider(ArrayContentProvider.getInstance());
DefaultTableLabelProvider labelProvider = new DefaultTableLabelProvider(); DefaultTableLabelProvider labelProvider = new DefaultTableLabelProvider();
@ -573,6 +598,13 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo
} }
}); });
fSeparateViewer.getControl().getAccessible().addAccessibleListener(new AccessibleAdapter() {
@Override
public void getName(AccessibleEvent e) {
e.result = PreferencesMessages.CodeAssistAdvancedConfigurationBlock_separate_table_description;
}
});
table.addSelectionListener(new SelectionAdapter() { table.addSelectionListener(new SelectionAdapter() {
@Override @Override
public void widgetSelected(SelectionEvent e) { public void widgetSelected(SelectionEvent e) {