Skip to content

Commit 7b3235f

Browse files
committed
[desktop_webview_window] fix linux title bar expanded unexpected
1 parent ef7924c commit 7b3235f

File tree

3 files changed

+36
-53
lines changed

3 files changed

+36
-53
lines changed

packages/desktop_webview_window/example/pubspec.lock

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ packages:
55
dependency: transitive
66
description:
77
name: async
8-
sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
8+
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
99
url: "https://pub.dev"
1010
source: hosted
11-
version: "2.10.0"
11+
version: "2.11.0"
1212
boolean_selector:
1313
dependency: transitive
1414
description:
@@ -21,10 +21,10 @@ packages:
2121
dependency: transitive
2222
description:
2323
name: characters
24-
sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
24+
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
2525
url: "https://pub.dev"
2626
source: hosted
27-
version: "1.2.1"
27+
version: "1.3.0"
2828
clock:
2929
dependency: transitive
3030
description:
@@ -37,10 +37,10 @@ packages:
3737
dependency: transitive
3838
description:
3939
name: collection
40-
sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
40+
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
4141
url: "https://pub.dev"
4242
source: hosted
43-
version: "1.17.0"
43+
version: "1.18.0"
4444
cupertino_icons:
4545
dependency: "direct main"
4646
description:
@@ -98,14 +98,6 @@ packages:
9898
description: flutter
9999
source: sdk
100100
version: "0.0.0"
101-
js:
102-
dependency: transitive
103-
description:
104-
name: js
105-
sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
106-
url: "https://pub.dev"
107-
source: hosted
108-
version: "0.6.5"
109101
lints:
110102
dependency: transitive
111103
description:
@@ -118,34 +110,34 @@ packages:
118110
dependency: transitive
119111
description:
120112
name: matcher
121-
sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
113+
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
122114
url: "https://pub.dev"
123115
source: hosted
124-
version: "0.12.13"
116+
version: "0.12.16"
125117
material_color_utilities:
126118
dependency: transitive
127119
description:
128120
name: material_color_utilities
129-
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
121+
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
130122
url: "https://pub.dev"
131123
source: hosted
132-
version: "0.2.0"
124+
version: "0.5.0"
133125
meta:
134126
dependency: transitive
135127
description:
136128
name: meta
137-
sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
129+
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
138130
url: "https://pub.dev"
139131
source: hosted
140-
version: "1.8.0"
132+
version: "1.9.1"
141133
path:
142134
dependency: transitive
143135
description:
144136
name: path
145-
sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
137+
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
146138
url: "https://pub.dev"
147139
source: hosted
148-
version: "1.8.2"
140+
version: "1.8.3"
149141
path_provider:
150142
dependency: "direct main"
151143
description:
@@ -235,26 +227,26 @@ packages:
235227
dependency: transitive
236228
description:
237229
name: source_span
238-
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
230+
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
239231
url: "https://pub.dev"
240232
source: hosted
241-
version: "1.9.1"
233+
version: "1.10.0"
242234
stack_trace:
243235
dependency: transitive
244236
description:
245237
name: stack_trace
246-
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
238+
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
247239
url: "https://pub.dev"
248240
source: hosted
249-
version: "1.11.0"
241+
version: "1.11.1"
250242
stream_channel:
251243
dependency: transitive
252244
description:
253245
name: stream_channel
254-
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
246+
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
255247
url: "https://pub.dev"
256248
source: hosted
257-
version: "2.1.1"
249+
version: "2.1.2"
258250
string_scanner:
259251
dependency: transitive
260252
description:
@@ -275,10 +267,10 @@ packages:
275267
dependency: transitive
276268
description:
277269
name: test_api
278-
sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
270+
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
279271
url: "https://pub.dev"
280272
source: hosted
281-
version: "0.4.16"
273+
version: "0.6.1"
282274
vector_math:
283275
dependency: transitive
284276
description:
@@ -287,6 +279,14 @@ packages:
287279
url: "https://pub.dev"
288280
source: hosted
289281
version: "2.1.4"
282+
web:
283+
dependency: transitive
284+
description:
285+
name: web
286+
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
287+
url: "https://pub.dev"
288+
source: hosted
289+
version: "0.1.4-beta"
290290
win32:
291291
dependency: transitive
292292
description:
@@ -304,5 +304,5 @@ packages:
304304
source: hosted
305305
version: "0.2.0+2"
306306
sdks:
307-
dart: ">=2.18.0 <3.0.0"
307+
dart: ">=3.1.0-185.0.dev <4.0.0"
308308
flutter: ">=3.0.0"

packages/desktop_webview_window/linux/webview_window.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ WebviewWindow::WebviewWindow(
9292
fl_plugin_registry_get_registrar_for_plugin(FL_PLUGIN_REGISTRY(title_bar), "DesktopWebviewWindowPlugin");
9393
client_message_channel_plugin_register_with_registrar(desktop_webview_window_registrar);
9494

95-
gtk_widget_set_size_request(GTK_WIDGET(title_bar), -1, title_bar_height);
95+
gtk_widget_set_size_request(GTK_WIDGET(title_bar), 200, title_bar_height);
96+
gtk_widget_set_vexpand(GTK_WIDGET(title_bar), FALSE);
9697
gtk_box_pack_start(box_, GTK_WIDGET(title_bar), FALSE, FALSE, 0);
9798

9899
// initial web_view
@@ -109,11 +110,10 @@ WebviewWindow::WebviewWindow(
109110
auto settings = webkit_web_view_get_settings(WEBKIT_WEB_VIEW(webview_));
110111
webkit_settings_set_javascript_can_open_windows_automatically(settings, true);
111112
default_user_agent_ = webkit_settings_get_user_agent(settings);
112-
gtk_box_pack_start(box_, webview_, true, true, 0);
113+
gtk_box_pack_end(box_, webview_, true, true, 0);
113114

115+
gtk_widget_show_all(GTK_WIDGET(window_));
114116
gtk_widget_grab_focus(GTK_WIDGET(webview_));
115-
gtk_widget_show_all(window_);
116-
gtk_widget_queue_resize(GTK_WIDGET(title_bar));
117117

118118
}
119119

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1 @@
1-
import 'package:flutter/services.dart';
2-
import 'package:flutter_test/flutter_test.dart';
3-
4-
void main() {
5-
const MethodChannel channel = MethodChannel('webview_window');
6-
7-
TestWidgetsFlutterBinding.ensureInitialized();
8-
9-
setUp(() {
10-
channel.setMockMethodCallHandler((MethodCall methodCall) async {
11-
return '42';
12-
});
13-
});
14-
15-
tearDown(() {
16-
channel.setMockMethodCallHandler(null);
17-
});
18-
}
1+
void main() {}

0 commit comments

Comments
 (0)