mirrors/ipscan
2
0
Fork 0
mirror of https://github.com/angryip/ipscan.git synced 2025-10-26 11:18:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

a better workaround for SWT bug

Browse Source 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=223015

git-svn-id: https://ipscan.svn.sourceforge.net/svnroot/ipscan/trunk@292 375186e5-ef17-0410-b0b6-91563547dcda
This commit is contained in:
angryziber 2008-03-17 22:38:21 +00:00
parent e03a437c86
commit 5dfd87456c
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/net/azib/ipscan/config/ComponentRegistry.java
View File

@ -129,7 +129,8 @@ public class ComponentRegistry {
new ComponentParameter("controlsArea"),
new ConstantParameter(new Integer(SWT.NONE))});
container.registerComponentImplementation("feederSelectionCombo", FeederSelectionCombo.class, new Parameter[] {
new ComponentParameter("controlsArea")});
new ComponentParameter("controlsArea"),
anyComponentParameter});
// GUI Feeders
container.registerComponentImplementation(FeederGUIRegistry.class);

32
src/net/azib/ipscan/gui/MainWindow.java
View File

@ -170,18 +170,12 @@ public class MainWindow {
// steal the height from the second child of the FeederGUI - this must be the first edit box.
// this results in better visual alignment with FeederGUIs
Control secondControl = feederRegistry.current().getChildren()[1];
int controlHeight = secondControl.getSize().y + 1;
//System.out.println(((Text)secondControl).getT);
// initialize global standard button height
guiConfig.standardButtonHeight = secondControl.getSize().y + 1;
// start/stop button
shell.setDefaultButton(startStopButton);
startStopButton.setLayoutData(new RowData(SWT.DEFAULT, controlHeight));
startStopButton.addSelectionListener(startStopScanningAction);
// feeder selection combobox
this.feederSelectionCombo = feederSelectionCombo;
feederSelectionCombo.setLayoutData(new RowData(SWT.DEFAULT, controlHeight));
feederSelectionCombo.setLayoutData(new RowData(SWT.DEFAULT, guiConfig.standardButtonHeight));
for (AbstractFeederGUI feederGUI : feederRegistry) {
feederSelectionCombo.add(feederGUI.getFeederName());
}
@ -192,15 +186,14 @@ public class MainWindow {
feederSelectionCombo.setToolTipText(Labels.getLabel("combobox.feeder.tooltip"));
feederSelectionListener.widgetSelected(null);
//((RowData)startStopButton.getLayoutData()).height = feederSelectionCombo.getBounds().height;
((RowData)startStopButton.getLayoutData()).width = feederSelectionCombo.getBounds().width;
// start/stop button
shell.setDefaultButton(startStopButton);
startStopButton.setLayoutData(new RowData(feederSelectionCombo.getBounds().width, guiConfig.standardButtonHeight));
startStopButton.addSelectionListener(startStopScanningAction);
// traverse the button before the combo (and don't traverse other buttons at all)
controlsArea.setTabList(new Control[] {startStopButton, feederSelectionCombo});
// initialize global standard button height
guiConfig.standardButtonHeight = feederSelectionCombo.getBounds().height;
int toolbarHeight = guiConfig.standardButtonHeight;
int toolbarWidth = guiConfig.standardButtonHeight + (Platform.MAC_OS ? 20 : 0);
@ -273,14 +266,17 @@ public class MainWindow {
}
public static class FeederSelectionCombo extends Combo {
public FeederSelectionCombo(Composite parent) {
private final GUIConfig guiConfig;
public FeederSelectionCombo(Composite parent, GUIConfig guiConfig) {
super(parent, SWT.READ_ONLY);
this.guiConfig = guiConfig;
}
@Override
public int getTextHeight() {
// fixes the problem described here: https://bugs.eclipse.org/bugs/show_bug.cgi?id=223015
return super.getTextHeight() + ((getStyle() & SWT.READ_ONLY) > 0 ? 5 : 0);
return guiConfig.standardButtonHeight;
}
@Override