mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-15 01:07:42 +00:00
Merge branch '7063-crPreviouslyNotable' into 7063-userRoleDiscovery
This commit is contained in:
commit
24cfe3b2f9
@ -114,8 +114,8 @@ abstract class AbstractFiltersPanel extends JPanel implements ActionListener, Li
|
|||||||
constraints.weightx = LABEL_WEIGHT;
|
constraints.weightx = LABEL_WEIGHT;
|
||||||
constraints.weighty = LABEL_WEIGHT;
|
constraints.weighty = LABEL_WEIGHT;
|
||||||
constraints.gridwidth = LABEL_WIDTH;
|
constraints.gridwidth = LABEL_WIDTH;
|
||||||
addToGridBagLayout(filterPanel.getCheckbox(), filterPanel.getAdditionalLabel(), column);
|
|
||||||
if (filterPanel.hasPanel()) {
|
if (filterPanel.hasPanel()) {
|
||||||
|
addToGridBagLayout(filterPanel.getCheckbox(), filterPanel.getAdditionalLabel(), column);
|
||||||
constraints.gridx += constraints.gridwidth;
|
constraints.gridx += constraints.gridwidth;
|
||||||
constraints.fill = GridBagConstraints.BOTH;
|
constraints.fill = GridBagConstraints.BOTH;
|
||||||
constraints.gridheight = PANEL_HEIGHT;
|
constraints.gridheight = PANEL_HEIGHT;
|
||||||
@ -123,6 +123,11 @@ abstract class AbstractFiltersPanel extends JPanel implements ActionListener, Li
|
|||||||
constraints.weighty = PANEL_WEIGHT;
|
constraints.weighty = PANEL_WEIGHT;
|
||||||
constraints.gridwidth = PANEL_WIDTH;
|
constraints.gridwidth = PANEL_WIDTH;
|
||||||
addToGridBagLayout(filterPanel, null, column);
|
addToGridBagLayout(filterPanel, null, column);
|
||||||
|
} else {
|
||||||
|
constraints.weightx = PANEL_WEIGHT;
|
||||||
|
constraints.fill = GridBagConstraints.BOTH;
|
||||||
|
constraints.gridwidth = PANEL_WIDTH + LABEL_WIDTH;
|
||||||
|
addToGridBagLayout(filterPanel.getCheckbox(), filterPanel.getAdditionalLabel(), column);
|
||||||
}
|
}
|
||||||
if (column == 0) {
|
if (column == 0) {
|
||||||
firstColumnY += constraints.gridheight;
|
firstColumnY += constraints.gridheight;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user