localhorst/TextureSync
3
1
Fork 0
Code Issues 2 Pull Requests Releases 3 Wiki Activity

resize&shortcuts #25

Manually merged
CodeSteak merged 16 commits from resize into master 2019-06-12 19:11:15 +02:00
Conversation 1 Commits 16 Files Changed 19 +10 -7
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 50ea54c8d6 - Show all commits

17
client/src/main/kotlin/org/hso/texturesyncclient/controller/RootController.kt
View File

@ -20,15 +20,14 @@ import org.hso.texturesyncclient.view.startupView.StartupViewController
import tornadofx.Controller
import tornadofx.find
import tornadofx.observable
import java.net.InetAddress
import java.util.Calendar
import java.io.File
import javax.imageio.ImageIO
import java.util.UUID
import java.nio.file.Files
import java.io.FileOutputStream
import java.io.IOException
import java.net.InetAddress
import java.nio.file.Files
import java.text.SimpleDateFormat
import java.util.*
import javax.imageio.ImageIO
class RootController : Controller() {
@ -262,7 +261,11 @@ class RootController : Controller() {
selectedTextureModel.data.textureHash
)
try {
con.updateTexture(selectedTextureModel.data, newTexture, con.getTextureFile(selectedTextureModel.data.textureHash))
con.updateTexture(
selectedTextureModel.data,
newTexture,
con.getTextureFile(selectedTextureModel.data.textureHash)
)
selectedTextureModel.setTexture(newTexture)
selectedTextureModel.data = newTexture
} catch (e: Exception) {
@ -281,7 +284,7 @@ class RootController : Controller() {
* set the last selected texture-GUIModell
* @param model the last selected element
*/
fun setSelectedTexture(model: GUIModel){
fun setSelectedTexture(model: GUIModel) {
selectedTextureModel = model
}