Alexandre Julliard : wineandroid: Specify the window scale directly in the constructor.
Alexandre Julliard
julliard at winehq.org
Mon Dec 3 15:28:53 CST 2018
Module: wine
Branch: master
Commit: 357c2bb9f984122f06f9d9a75c004ff05c1b625e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=357c2bb9f984122f06f9d9a75c004ff05c1b625e
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Dec 3 16:16:48 2018 +0100
wineandroid: Specify the window scale directly in the constructor.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wineandroid.drv/WineActivity.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java
index 8013b3a..6e6bbff 100644
--- a/dlls/wineandroid.drv/WineActivity.java
+++ b/dlls/wineandroid.drv/WineActivity.java
@@ -348,16 +348,16 @@ public class WineActivity extends Activity
protected WineWindowGroup window_group;
protected WineWindowGroup client_group;
- public WineWindow( int w, WineWindow parent )
+ public WineWindow( int w, WineWindow parent, float scale )
{
Log.i( LOGTAG, String.format( "create hwnd %08x", w ));
hwnd = w;
owner = 0;
style = 0;
- scale = 1.0f;
visible = false;
visible_rect = client_rect = new Rect( 0, 0, 0, 0 );
this.parent = parent;
+ this.scale = scale;
children = new ArrayList<WineWindow>();
win_map.put( w, this );
if (parent != null) parent.children.add( this );
@@ -744,11 +744,11 @@ public class WineActivity extends Activity
public TopView( Context context, int hwnd )
{
super( context );
- desktop_window = new WineWindow( hwnd, null );
+ desktop_window = new WineWindow( hwnd, null, 1.0f );
addView( desktop_window.create_whole_view() );
desktop_window.client_group.bringToFront();
- message_window = new WineWindow( WineWindow.HWND_MESSAGE, null );
+ message_window = new WineWindow( WineWindow.HWND_MESSAGE, null, 1.0f );
message_window.create_window_groups();
}
@@ -786,8 +786,7 @@ public class WineActivity extends Activity
WineWindow win = get_window( hwnd );
if (win == null)
{
- win = new WineWindow( hwnd, get_window( parent ));
- win.scale = scale;
+ win = new WineWindow( hwnd, get_window( parent ), scale );
win.create_window_groups();
if (win.parent == desktop_window) win.create_whole_view();
}
More information about the wine-cvs
mailing list