Changeset 5122

Timestamp:

Mar 12, 2010, 9:56:10 PM (14 years ago)

Author:

ronosman

Message:

Fix sizer expand issues for comment and privacy level properties.

File:

• extensions/pLoader/trunk/src/Uploader/GUI/Layout/PhotoPropertiesCategoriesTags.pm (modified) (6 diffs)

extensions/pLoader/trunk/src/Uploader/GUI/Layout/PhotoPropertiesCategoriesTags.pm

@@ -128 +128 @@
     );
 
-    $topsizer->Add( 
+    my $sizer_comment = Wx::BoxSizer->new( wxHORIZONTAL );
+    $sizer_comment->Add( 
         TextField(
             $parent,
             $main::COMMENT,
             $main::PHOTO_PROPERTIES_COMMENT,
-            1
+            1,
+            wxTE_MULTILINE
         ),
         1,
@@ -139 +141 @@
         2
     );
+
+    $topsizer->Add( $sizer_comment, 1, wxEXPAND|wxALL, 2 );
 
     my $sizer_author_create = Wx::BoxSizer->new( wxVERTICAL );
@@ -165 +169 @@
     my $sizer_author_create_privacy = Wx::BoxSizer->new( wxHORIZONTAL );
 
-    $sizer_author_create_privacy->Add($sizer_author_create, 0, wxEXPAND|wxALL, 0);
-
-    $sizer_author_create_privacy->Add( 
+    my $sizer_privacy = Wx::BoxSizer->new( wxHORIZONTAL );
+
+    $sizer_privacy->Add( 
         ChoiceField(
             $parent,
             $main::PRIVACY_LEVEL,
             $main::PHOTO_PROPERTIES_PRIVACY_LEVEL,
-            1
         ),
         1,
-        wxEXPAND|wxALL,
-        2
-    );
+        wxALL,
+        2
+    );
+
+    $sizer_author_create_privacy->Add($sizer_author_create, 0, wxEXPAND|wxALL, 0);
+    $sizer_author_create_privacy->Add($sizer_privacy, 1, wxEXPAND|wxALL, 0);
+
 
     $topsizer->Add( $sizer_author_create_privacy, 0, wxEXPAND|wxALL, 2 );
@@ -191 +198 @@
 
 sub TextField {
-    my ( $parent, $id_label, $id_textctrl, $expand ) = @_;
-
-    $expand ||=0;
+    my ( $parent, $id_label, $id_textctrl, $expand, $style ) = @_;
+
+    $expand||=0;
+    $style||0;
 
     my( $sizer ) = Wx::BoxSizer->new( wxVERTICAL );
@@ -218 +226 @@
             wxDefaultPosition,
             [-1,-1],
-            0 
+            $style 
         ),
         $expand,
@@ -298 +306 @@
             0
         ),
-        1,
+        $expand,
         wxEXPAND|wxALL,
         1