Skip to content

Add search bar to biome widget #823

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

Open
burgerindividual wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Add search bar to biome widget #823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7559683
add search bar to biome widget
burgerindividual Jul 20, 2020
6a1425b
Merge branch 'master' into biome-widget-filter
burgerindividual Jul 24, 2020
342f3f6
merge master
burgerindividual Aug 6, 2020
bb318b0
Merge branch 'master' into biome-widget-filter
burgerindividual Aug 11, 2020
cabef44
merge master, start widget changes
burgerindividual Aug 25, 2020
e4c1573
undo starting widget refactoring because it's larger than i thought
burgerindividual Aug 25, 2020
54fcc55
add highlight to search, only calculate some things when needed
burgerindividual Aug 25, 2020
3cf3558
Merge branch 'master' into biome-widget-filter
burgerindividual Sep 9, 2020
08af67c
don't have temporary sets for biomes
burgerindividual Sep 13, 2020
bf20f69
Merge branch 'master' into biome-widget-filter
burgerindividual Sep 13, 2020
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
12 changes: 9 additions & 3 deletions src/main/java/amidst/gui/main/viewer/PerViewerFacadeInjector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Supplier;

import javax.swing.JComponent;

import amidst.AmidstSettings;
import amidst.documentation.AmidstThread;
import amidst.documentation.CalledOnlyBy;
Expand Down Expand Up @@ -50,10 +52,11 @@ private static List<Widget> createWidgets(
FragmentManager fragmentManager,
Graphics2DAccelerationCounter accelerationCounter,
AmidstSettings settings,
Supplier<Entry<ProgressEntryType, Integer>> progressEntrySupplier) {
Supplier<Entry<ProgressEntryType, Integer>> progressEntrySupplier,
Supplier<JComponent> parentComponentSupplier) {
// @formatter:off
DebugWidget debugWidget = new DebugWidget(CornerAnchorPoint.BOTTOM_RIGHT, graph, fragmentManager, settings.showDebug, accelerationCounter, zoom);
BiomeWidget biomeWidget = new BiomeWidget(CornerAnchorPoint.NONE, biomeSelection, layerReloader, settings.biomeProfileSelection, world.getBiomeList());
BiomeWidget biomeWidget = new BiomeWidget(CornerAnchorPoint.NONE, biomeSelection, layerReloader, settings.biomeProfileSelection, world.getBiomeList(), parentComponentSupplier);
BiomeToggleWidget biomeToggleWidget = new BiomeToggleWidget(CornerAnchorPoint.BOTTOM_RIGHT, biomeWidget, biomeSelection);
WorldOptions worldOptions = world.getWorldOptions();
return Arrays.asList(
Expand Down Expand Up @@ -107,6 +110,7 @@ public PerViewerFacadeInjector(
this.fragmentQueueProcessor = fragmentManager.createQueueProcessor(layerManager, settings.dimension);
this.layerReloader = layerManager.createLayerReloader(world);
this.progressEntryHolder = new AtomicReference<Entry<ProgressEntryType, Integer>>();
AtomicReference<JComponent> parentComponentReference = new AtomicReference<>();
this.widgets = createWidgets(
world,
graph,
Expand All @@ -118,7 +122,8 @@ public PerViewerFacadeInjector(
fragmentManager,
accelerationCounter,
settings,
progressEntryHolder::get);
progressEntryHolder::get,
parentComponentReference::get);
this.drawer = new Drawer(
graph,
translator,
Expand All @@ -131,6 +136,7 @@ public PerViewerFacadeInjector(
this.widgetManager = new WidgetManager(widgets);
this.viewerMouseListener = new ViewerMouseListener(widgetManager, graph, translator, zoom, movement, actions);
this.viewer = new Viewer(viewerMouseListener, drawer);
parentComponentReference.set((JComponent) viewer.getComponent());
this.viewerFacade = new ViewerFacade(
world,
fragmentManager,
Expand Down
Loading