AndrewRigg / Crossword

Crossword Generator made by Steven Court
0 stars 0 forks source link

Zoom + mergeTest + new_crossword_layout combined. #67

Closed Golpette closed 7 years ago

Golpette commented 7 years ago

Right Andy, I hope I understood your branches and merged the right ones. This is a combination of your mergeTest and Zoom branches with my new_crossword_layout branch.

I think I fixed all the merge conflicts since it seems to work really well on my computer... but I really did have to change a lot. All the paackages were wrong basically... were either of these branches working on your computer!? If not, why did you push them? If they were, I hope they still are after my changes.

Is the Zoom branch your most up to date work? Is it stable? If so, we should merge this branhc into master.

What's new from my stuff:

Still in the process of playing around with layout of crossword but it's starting to look nice and I think it is more usable. Implemented your FlowLayout idea and changed all the JLabels to JTextAreas so we could do text wrapping. Split across and down clues into separate panels so they're side by side. (Still need to try and fix their vertical alignment but it looks better than before anyway).

Also I finished implementing clue highlighting when words in crossword are selected - it should now be the case that there is always one word and one clue highlighted in green. These should change by clicking on grid, pushing any text or arrow key, or by hovering your mouse over the actual clue.

Let me know if this is working on your computer yet? I changed a lot of the layout parameters so hopefully this issue just disappears haha

Golpette commented 7 years ago

Actually, I had only looked at crosswords... something funny is going on with the zoom in the wordsearches. Seems that by zooming in on a specific location you can push it out the frame / overlap with the clues. Also, when it first generates there are no letters.

I think it's maybe unnecessary for the new type of zoom? I think it was working nice before

Golpette commented 7 years ago

I've fixed the scrolling so that you can both scroll (without ctrl) and zoom (with ctrl) from any point in the scrollPane.

One thing I haven't figured out though, is that when the crossword appears the scroll bars always start from the bottom right and you have to scroll up to the top... Would be nice if it starts in the top left.

Golpette commented 7 years ago

Also, I meant to ask: I don't think we should waste much time trying to do this now,since we'll need to change it all later... but I was wanting to enable left-right scrolling with the trackpad. I saw all the scrolling is a mouseWheel event - which is equivalent to a 2 finger trackpad movement - but mouseWheel only has up and down. I had a quick google earlier and it seems this might not be easy in java.

Do you know? Like I said, happy to leave it for now, it's not that important.

Crossword is starting to look really good! I think soon I will try and see if I can restructure it / get rid of excess code. A lot of loops I suspect may not be necessary, might make it smoother