Changeset - r13311:815ca89c5b47
Parent rev.
Child rev.
[Not reviewed]
master
0 3 0
frosch - 15 years ago 2009-10-20 21:25:25
frosch@openttd.org
(svn r17830) -Fix [FS#3276]: Some windows already need their window_number when setting up smallest size (e.g. for DParams). So assign it earlier in Window::InitializeData instead of dealing with each window separately.
3 files changed with 11 insertions and 12 deletions:
src/autoreplace_gui.cpp
1
src/depot_gui.cpp
2
4
src/window.cpp
9
7
0 comments (0 inline, 0 general)
src/autoreplace_gui.cpp
➞
Show inline comments
 
@@ -203,13 +203,12 @@ public:
 
		this->engines[1].ForceRebuild();
 
		this->reset_sel_engine = true;
 
		this->details_height   = ((vehicletype == VEH_TRAIN) ? 10 : 9) * FONT_HEIGHT_NORMAL + WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM;
 
		this->sel_engine[0] = INVALID_ENGINE;
 
		this->sel_engine[1] = INVALID_ENGINE;
 

			




	
	
	
		
 
		this->window_number = vehicletype;

			




	
	
	
		
 
		this->InitNested(desc, vehicletype);

			




	
	
	
		
 

			




	
	
	
		
 
		this->vscroll.SetCapacity(this->GetWidget<NWidgetBase>(RVW_WIDGET_LEFT_MATRIX)->current_y / this->resize.step_height);

			




	
	
	
		
 
		this->vscroll2.SetCapacity(this->vscroll.GetCapacity());   // these two are always the same

			




	
	
	
		
 

			




	
	
	
		
 
		this->GetWidget<NWidgetCore>(RVW_WIDGET_LEFT_MATRIX)->widget_data =

			




        

    


    
    

    

        

                

                    src/depot_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -227,17 +227,15 @@ struct DepotWindow : Window {

			




	
	
	
		
 
	{

			




	
	
	
		
 
		this->sel = INVALID_VEHICLE;

			




	
	
	
		
 
		this->generate_list = true;

			




	
	
	
		
 
		this->type = type;

			




	
	
	
		
 

			




	
	
	
		
 
		this->CreateNestedTree(desc);

			




	
	
	
		
 
		this->SetupWidgetData(type);

			




	
	
	
		
 
		this->FinishInitNested(desc, tile);

			




	
	
	
		
 

			




	
	
	
		
 
		this->window_number = tile;

			




	
	
	
		
 
		this->SetupWidgetData(type);

			




	
	
	
		
 

			




	
	
	
		
 
		this->FinishInitNested(desc, tile);

			




	
	
	
		
 
		this->owner = GetTileOwner(tile);

			




	
	
	
		
 
		this->CreateDepotListWindow(type);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	~DepotWindow()

			




	
	
	
		
 
	{

			




        

    


    
    

    

        

                

                    src/window.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -914,12 +914,20 @@ static void AssignWidgetToWindow(Window 

			




	
	
	
		
 
 * @return Window pointer of the newly created window

			




	
	
	
		
 
 * @pre If nested widgets are used (\a widget is \c NULL), #nested_root and #nested_array_size must be initialized.

			




	
	
	
		
 
 *      In addition, #nested_array is either \c NULL, or already initialized.

			




	
	
	
		
 
 */

			




	
	
	
		
 
void Window::InitializeData(WindowClass cls, const Widget *widget, int window_number)

			




	
	
	
		
 
{

			




	
	
	
		
 
	/* Set up window properties; some of them are needed to set up smallest size below */

			




	
	
	
		
 
	this->window_class = cls;

			




	
	
	
		
 
	this->flags4 = WF_WHITE_BORDER_MASK; // just opened windows have a white border

			




	
	
	
		
 
	this->owner = INVALID_OWNER;

			




	
	
	
		
 
	this->focused_widget = NULL;

			




	
	
	
		
 
	this->nested_focus = NULL;

			




	
	
	
		
 
	this->window_number = window_number;

			




	
	
	
		
 

			




	
	
	
		
 
	/* If available, initialize nested widget tree. */

			




	
	
	
		
 
	if (widget == NULL) {

			




	
	
	
		
 
		if (this->nested_array == NULL) {

			




	
	
	
		
 
			this->nested_array = CallocT<NWidgetBase *>(this->nested_array_size);

			




	
	
	
		
 
			this->nested_root->SetupSmallestSize(this, true);

			




	
	
	
		
 
		} else {

			




	
	
		
 
@@ -927,23 +935,17 @@ void Window::InitializeData(WindowClass 

			




	
	
	
		
 
		}

			




	
	
	
		
 
		/* Initialize to smallest size. */

			




	
	
	
		
 
		this->nested_root->AssignSizePosition(ST_SMALLEST, 0, 0, this->nested_root->smallest_x, this->nested_root->smallest_y, false, false, false);

			




	
	
	
		
 
	}

			




	
	
	
		
 
	/* Else, all data members of nested widgets have been set to 0 by the #ZeroedMemoryAllocator base class. */

			




	
	
	
		
 

			




	
	
	
		
 
	/* Set up window properties,

			




	
	
	
		
 
	/* Further set up window properties,

			




	
	
	
		
 
	 * this->left, this->top, this->width, this->height, this->resize.width, and this->resize.height are initialized later. */

			




	
	
	
		
 
	this->window_class = cls;

			




	
	
	
		
 
	this->flags4 = WF_WHITE_BORDER_MASK; // just opened windows have a white border

			




	
	
	
		
 
	this->owner = INVALID_OWNER;

			




	
	
	
		
 
	AssignWidgetToWindow(this, widget);

			




	
	
	
		
 
	this->focused_widget = NULL;

			




	
	
	
		
 
	this->nested_focus = NULL;

			




	
	
	
		
 
	this->resize.step_width  = (this->nested_root != NULL) ? this->nested_root->resize_x : 1;

			




	
	
	
		
 
	this->resize.step_height = (this->nested_root != NULL) ? this->nested_root->resize_y : 1;

			




	
	
	
		
 
	this->window_number = window_number;

			




	
	
	
		
 

			




	
	
	
		
 
	/* Give focus to the opened window unless it is the OSK window or a text box

			




	
	
	
		
 
	 * of focused window has focus (so we don't interrupt typing). But if the new

			




	
	
	
		
 
	 * window has a text box, then take focus anyway. */

			




	
	
	
		
 
	bool has_editbox = (this->widget != NULL && this->GetWidgetOfType(WWT_EDITBOX) != NULL) ||

			




	
	
	
		
 
			(this->nested_root != NULL && this->nested_root->GetWidgetOfType(WWT_EDITBOX) != NULL);

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: code.theleruby.com-48
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2022 by various authors & licensed under GPLv3.
            – Support