| Chunk |
|---|
| Conflicting content |
|---|
if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)){
axis = Orientation.HORIZONTAL;
}
<<<<<<< HEAD
for(Widget w:getScreen().getAttachedWidgets()) {
if(w instanceof Scrollable) {
if(isInBoundingRect(w, x, y)) {
=======
for(Widget w:getScreen().getAttachedWidgets(true)) {
if(w != null && isInBoundingRect(w, x, y)) {
if(w instanceof Scrollable) {
>>>>>>> 7e1e5646d3195b154f02e6bc67f2b853e9b49287
//Stupid LWJGL not recognizing vertical scrolls :(
Scrollable lw = (Scrollable)w;
if(axis == Orientation.VERTICAL) { |
| Solution content |
|---|
if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)){
axis = Orientation.HORIZONTAL;
}
for(Widget w:getScreen().getAttachedWidgets(true)) {
if(w != null && isInBoundingRect(w, x, y)) {
if(w instanceof Scrollable) {
//Stupid LWJGL not recognizing vertical scrolls :(
Scrollable lw = (Scrollable)w;
if(axis == Orientation.VERTICAL) { |
| File |
|---|
| GuiScreen.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| For statement |
| If statement |
| Chunk |
|---|
| Conflicting content |
|---|
double mouseX = slider.getScreen().getMouseX();
<<<<<<< HEAD
RenderUtil.drawTexturedModalRectangle(0, 0, 0, 46, (int) Math.ceil(width / 2), 20, 0f);
RenderUtil.drawTexturedModalRectangle((int) Math.floor(width / 2), 0, 200 - (int) Math.ceil(width / 2), 46, (int) Math.ceil(width / 2), 20, 0f);
=======
boolean hovering = isHovering(slider);
int hoverState = getHoverState(slider, hovering);
RenderUtil.drawTexturedModalRectangle(0, 0, 0, 46 + hoverState * 20, (int) Math.ceil(width / 2), 20, 0f);
RenderUtil.drawTexturedModalRectangle((int) Math.floor(width / 2), 0, 200 - (int) Math.ceil(width / 2), 46 + hoverState * 20, (int) Math.ceil(width / 2), 20, 0f);
>>>>>>> 7e1e5646d3195b154f02e6bc67f2b853e9b49287
if (slider.isDragging()) {
slider.setSliderPosition((float) (mouseX - (slider.getScreenX() + 4)) / (float) (slider.getWidth() - 8)); |
| Solution content |
|---|
double mouseX = slider.getScreen().getMouseX();
RenderUtil.drawTexturedModalRectangle(0, 0, 0, 46, (int) Math.ceil(width / 2), 20, 0f);
RenderUtil.drawTexturedModalRectangle((int) Math.floor(width / 2), 0, 200 - (int) Math.ceil(width / 2), 46, (int) Math.ceil(width / 2), 20, 0f);
if (slider.isDragging()) {
slider.setSliderPosition((float) (mouseX - (slider.getScreenX() + 4)) / (float) (slider.getWidth() - 8)); |
| File |
|---|
| MCRenderDelegate.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |