Fix for not setting image position preventing image from being shown #22

.
Thizzer · Apr 17, 2018 · 3cfaba6 · 3cfaba6
1 parent 563a8bf
commit 3cfaba6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/src/debug/resources/lib/libJTouchBar.dylib b/src/debug/resources/lib/libJTouchBar.dylib
diff --git a/src/main/java/com/thizzer/jtouchbar/item/view/TouchBarButton.java b/src/main/java/com/thizzer/jtouchbar/item/view/TouchBarButton.java
@@ -18,7 +18,7 @@ public class TouchBarButton extends TouchBarView {
 	private String _title;
 
 	private Image _image;
-	private int _imagePosition;
+	private int _imagePosition = ImagePosition.OVERLAPS;
 
 	private Color _bezelColor;
 

diff --git a/src/main/objective-c++/Bridged/JavaTouchBarItem.mm b/src/main/objective-c++/Bridged/JavaTouchBarItem.mm
@@ -200,22 +200,18 @@ -(void) updateButton:(NSButton*)button env:(JNIEnv*)env jTouchBarView:(jobject)j
     });
 
     image_t image = JNIContext::CallImageMethod(env, jTouchBarView, "getImage");
+    int imagePosition = JNIContext::CallIntMethod(env, jTouchBarView, "getImagePosition");
+
     NSImage *nsImage = [JTouchBarUtils getNSImage:image];
     if(nsImage != nil) {
        dispatch_async(dispatch_get_main_queue(), ^{
            [button setImage:nsImage];
+           [button setImagePosition:(NSCellImagePosition)imagePosition];
        });
     }
-
-    if(button.image != nil) {
-        int imagePosition = JNIContext::CallIntMethod(env, jTouchBarView, "getImagePosition");
-        dispatch_async(dispatch_get_main_queue(), ^{
-            [button setImagePosition:(NSCellImagePosition)imagePosition];
-        });
-    }
-
+
     bool enabled = JNIContext::CallBooleanMethod(env, jTouchBarView, "isEnabled");
-    [button setEnabled: enabled];
+    [button setEnabled:enabled];
 }
 
 -(void) updateTextField:(NSTextField*)textField env:(JNIEnv*)env jTouchBarView:(jobject)jTouchBarView {

diff --git a/src/release/resources/lib/libJTouchBar.dylib b/src/release/resources/lib/libJTouchBar.dylib
diff --git a/...release/resources/lib/libJTouchBar.dylib.dSYM/Contents/Resources/DWARF/libJTouchBar.dylib b/...release/resources/lib/libJTouchBar.dylib.dSYM/Contents/Resources/DWARF/libJTouchBar.dylib