aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/console/command/config
diff options
context:
space:
mode:
author3D-I <marktravai@gmail.com>2019-05-16 21:53:20 +0200
committer3D-I <marktravai@gmail.com>2019-05-16 21:53:43 +0200
commit72be8e08705fa103adc6482af9712077cdceb8cc (patch)
treecbf7394633ffb2712bd51fd084185c242aec7dc8 /phpBB/phpbb/console/command/config
parent61bdccbfd804c6638e977d250f6e9a0f30aa5f98 (diff)
downloadforums-72be8e08705fa103adc6482af9712077cdceb8cc.tar
forums-72be8e08705fa103adc6482af9712077cdceb8cc.tar.gz
forums-72be8e08705fa103adc6482af9712077cdceb8cc.tar.bz2
forums-72be8e08705fa103adc6482af9712077cdceb8cc.tar.xz
forums-72be8e08705fa103adc6482af9712077cdceb8cc.zip
[ticket/16055] Fix Oauth's redirects
Via forum, memberlist, topic or post etc.. PHPBB3-16055
Diffstat (limited to 'phpBB/phpbb/console/command/config')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.2.1 (git 2.21.0) at 2025-10-31 17:41:02 +0000
th>2391fd61ff2208990b383fa7e4d0490937c13798 (patch) tree1220c8ad2832c79a7663172df949ba744e1f83a1 parentb1013047af876ec8de2e1b59b5817907111d1053 (diff)downloaddrakx-2391fd61ff2208990b383fa7e4d0490937c13798.tar
drakx-2391fd61ff2208990b383fa7e4d0490937c13798.tar.gz
drakx-2391fd61ff2208990b383fa7e4d0490937c13798.tar.bz2
drakx-2391fd61ff2208990b383fa7e4d0490937c13798.tar.xz
drakx-2391fd61ff2208990b383fa7e4d0490937c13798.zip
use my_gtk {isWizard} and {isEmbedded} which are more accurate than
$::isWizard && !$my_gtk::pop_it and $::isEmbedded && !$my_gtk::pop_it, since when the Plug is full, the window is not embedded.
Diffstat
-rw-r--r--perl-install/interactive/gtk.pm10
1 files changed, 4 insertions, 6 deletions
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index 2e2caf92b..106df7706 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -500,10 +500,8 @@ sub ask_fromW {
my ($totalheight, $totalwidth) = ($mainw->{box_size}, 0);
my $set_default_size = sub {
- if (!$::isEmbedded && !$::isWizard || $my_gtk::pop_it) {
- if ($has_scroll || $has_horiz_scroll) {
- $mainw->{rwindow}->set_default_size($totalwidth+6+$my_gtk::shape_width, $has_scroll ? $totalheight+6+3+$my_gtk::shape_width : 0);
- }
+ if (($has_scroll || $has_horiz_scroll) && !$mainw->{isEmbedded} && !$mainw->{isWizard}) {
+ $mainw->{rwindow}->set_default_size($totalwidth+6+$my_gtk::shape_width, $has_scroll ? $totalheight+6+3+$my_gtk::shape_width : 0);
}
};
@@ -529,7 +527,7 @@ sub ask_fromW {
$size && $total_size or return $w; #- do not bother computing stupid/bad things
my $ratio = max($size / $total_size, 0.2);
- my ($possibleheight, $possiblewidth) = $::isEmbedded && !$my_gtk::pop_it ? (450, 380) : ($::windowheight * 0.8, $::windowwidth * 0.8);
+ my ($possibleheight, $possiblewidth) = $mainw->{isEmbedded} ? (450, 380) : ($::windowheight * 0.8, $::windowwidth * 0.8);
$possibleheight -= $mainw->{box_size};
my $wantedwidth = max(250, $max_width * 5);
@@ -598,7 +596,7 @@ sub wait_messageW($$$) {
$box->pack_start($_, 1, 1, 4) foreach my @l = map { new Gtk::Label(scalar warp_text($_)) } @$messages;
($w->{wait_messageW} = $l[$#l])->signal_connect(expose_event => sub { $w->{displayed} = 1 });
- $w->{rwindow}->set_position('center') if ($::isStandalone && (!$::isEmbedded && !$::isWizard || $my_gtk::pop_it));
+ $w->{rwindow}->set_position('center') if $::isStandalone && !$w->{isEmbedded} && !$w->{isWizard};
$w->{window}->show_all;
$w->sync until $w->{displayed};
$w;
generated by cgit v1.2.1 (git 2.21.0) at 2025-10-31 17:41:02 +0000