Changeset - r25119:4f0f715fe0f7
Parent rev.
Child rev.
[Not reviewed]
master
0 2 0
Didac Perez Parera - 3 years ago 2021-04-05 20:24:03
perez.didac@gmail.com
Change: Disable NewGRF window apply button if no change was made (#8934)
2 files changed with 44 insertions and 16 deletions:
src/newgrf_gui.cpp
39
13
src/window_type.h
5
3
0 comments (0 inline, 0 general)
src/newgrf_gui.cpp
➞
Show inline comments
 
@@ -612,6 +612,7 @@ struct NewGRFWindow : public Window, New
 
	bool execute;               ///< On pressing 'apply changes' are grf changes applied immediately, or only list is updated.
 
	int preset;                 ///< Selected preset or \c -1 if none selected.
 
	int active_over;            ///< Active GRF item over which another one is dragged, \c -1 if none.
 
	bool modified;              ///< The list of active NewGRFs has been modified since the last time they got saved.
 

			




	
	
	
		
 
	Scrollbar *vscroll;

			




	
	
	
		
 
	Scrollbar *vscroll2;

			




	
	
		
 
@@ -654,7 +655,7 @@ struct NewGRFWindow : public Window, New

			




	
	
	
		
 
		this->avails.SetFilterFuncs(this->filter_funcs);

			




	
	
	
		
 
		this->avails.ForceRebuild();

			




	
	
	
		
 

			




	
	
	
		
 
		this->OnInvalidateData(GOID_NEWGRF_LIST_EDITED);

			




	
	
	
		
 
		this->OnInvalidateData(GOID_NEWGRF_CURRENT_LOADED);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	~NewGRFWindow()

			




	
	
		
 
@@ -663,7 +664,7 @@ struct NewGRFWindow : public Window, New

			




	
	
	
		
 
		DeleteWindowByClass(WC_TEXTFILE);

			




	
	
	
		
 
		DeleteWindowByClass(WC_SAVE_PRESET);

			




	
	
	
		
 

			




	
	
	
		
 
		if (this->editable && !this->execute && !_exit_game) {

			




	
	
	
		
 
		if (this->editable && this->modified && !this->execute && !_exit_game) {

			




	
	
	
		
 
			CopyGRFConfigList(this->orig_list, this->actives, true);

			




	
	
	
		
 
			ResetGRFConfig(false);

			




	
	
	
		
 
			ReloadNewGRFData();

			




	
	
		
 
@@ -970,7 +971,7 @@ struct NewGRFWindow : public Window, New

			




	
	
	
		
 
				}

			




	
	
	
		
 
				this->vscroll->ScrollTowards(pos);

			




	
	
	
		
 
				this->preset = -1;

			




	
	
	
		
 
				this->InvalidateData();

			




	
	
	
		
 
				this->InvalidateData(GOID_NEWGRF_LIST_EDITED);

			




	
	
	
		
 
				break;

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
		
 
@@ -989,7 +990,7 @@ struct NewGRFWindow : public Window, New

			




	
	
	
		
 
				}

			




	
	
	
		
 
				this->vscroll->ScrollTowards(pos);

			




	
	
	
		
 
				this->preset = -1;

			




	
	
	
		
 
				this->InvalidateData();

			




	
	
	
		
 
				this->InvalidateData(GOID_NEWGRF_LIST_EDITED);

			




	
	
	
		
 
				break;

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
		
 
@@ -1095,6 +1096,7 @@ struct NewGRFWindow : public Window, New

			




	
	
	
		
 
					CopyGRFConfigList(this->orig_list, this->actives, true);

			




	
	
	
		
 
					ResetGRFConfig(false);

			




	
	
	
		
 
					ReloadNewGRFData();

			




	
	
	
		
 
					this->InvalidateData(GOID_NEWGRF_CHANGES_APPLIED);

			




	
	
	
		
 
				}

			




	
	
	
		
 
				this->DeleteChildWindows(WC_QUERY_STRING); // Remove the parameter query window

			




	
	
	
		
 
				break;

			




	
	
		
 
@@ -1104,6 +1106,7 @@ struct NewGRFWindow : public Window, New

			




	
	
	
		
 
				if (this->active_sel == nullptr || !this->show_params || this->active_sel->num_valid_params == 0) break;

			




	
	
	
		
 

			




	
	
	
		
 
				OpenGRFParameterWindow(this->active_sel, this->editable);

			




	
	
	
		
 
				this->InvalidateData(GOID_NEWGRF_CHANGES_MADE);

			




	
	
	
		
 
				break;

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
		
 
@@ -1111,6 +1114,7 @@ struct NewGRFWindow : public Window, New

			




	
	
	
		
 
				if (this->active_sel != nullptr && this->editable) {

			




	
	
	
		
 
					this->active_sel->palette ^= GRFP_USE_MASK;

			




	
	
	
		
 
					this->SetDirty();

			




	
	
	
		
 
					this->InvalidateData(GOID_NEWGRF_CHANGES_MADE);

			




	
	
	
		
 
				}

			




	
	
	
		
 
				break;

			




	
	
	
		
 

			




	
	
		
 
@@ -1157,7 +1161,7 @@ struct NewGRFWindow : public Window, New

			




	
	
	
		
 
		DeleteWindowByClass(WC_GRF_PARAMETERS);

			




	
	
	
		
 
		DeleteWindowByClass(WC_TEXTFILE);

			




	
	
	
		
 
		this->active_sel = nullptr;

			




	
	
	
		
 
		this->InvalidateData(GOID_NEWGRF_PRESET_LOADED);

			




	
	
	
		
 
		this->InvalidateData(GOID_NEWGRF_CHANGES_MADE);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	void OnQueryTextFinished(char *str) override

			




	
	
		
 
@@ -1179,6 +1183,20 @@ struct NewGRFWindow : public Window, New

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	/**

			




	
	
	
		
 
	 * Updates the scroll bars for the active and inactive NewGRF lists.

			




	
	
	
		
 
	 */

			




	
	
	
		
 
	void UpdateScrollBars()

			




	
	
	
		
 
	{

			




	
	
	
		
 
		/* Update scrollbars */

			




	
	
	
		
 
		int i = 0;

			




	
	
	
		
 
		for (const GRFConfig *c = this->actives; c != nullptr; c = c->next, i++) {}

			




	
	
	
		
 

			




	
	
	
		
 
		this->vscroll->SetCount(i + 1); // Reserve empty space for drag and drop handling.

			




	
	
	
		
 

			




	
	
	
		
 
		if (this->avail_pos >= 0) this->vscroll2->ScrollTowards(this->avail_pos);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	/**

			




	
	
	
		
 
	 * Some data on this window has become invalid.

			




	
	
	
		
 
	 * @param data Information about the changed data. @see GameOptionsInvalidationData

			




	
	
	
		
 
	 * @param gui_scope Whether the call is done from GUI scope. You may not do everything when not in GUI scope. See #InvalidateWindowData() for details.

			




	
	
		
 
@@ -1212,27 +1230,34 @@ struct NewGRFWindow : public Window, New

			




	
	
	
		
 
				this->avails.ForceRebuild();

			




	
	
	
		
 
				FALLTHROUGH;

			




	
	
	
		
 

			




	
	
	
		
 
			case GOID_NEWGRF_CURRENT_LOADED:

			




	
	
	
		
 
				this->modified = false;

			




	
	
	
		
 
				UpdateScrollBars();

			




	
	
	
		
 
				break;

			




	
	
	
		
 

			




	
	
	
		
 
			case GOID_NEWGRF_LIST_EDITED:

			




	
	
	
		
 
				this->preset = -1;

			




	
	
	
		
 
				FALLTHROUGH;

			




	
	
	
		
 

			




	
	
	
		
 
			case GOID_NEWGRF_PRESET_LOADED: {

			




	
	
	
		
 
				/* Update scrollbars */

			




	
	
	
		
 
				int i = 0;

			




	
	
	
		
 
				for (const GRFConfig *c = this->actives; c != nullptr; c = c->next, i++) {}

			




	
	
	
		
 
			case GOID_NEWGRF_CHANGES_MADE:

			




	
	
	
		
 
				UpdateScrollBars();

			




	
	
	
		
 

			




	
	
	
		
 
				/* Changes have been made to the list of active NewGRFs */

			




	
	
	
		
 
				this->modified = true;

			




	
	
	
		
 

			




	
	
	
		
 
				this->vscroll->SetCount(i + 1); // Reserve empty space for drag and drop handling.

			




	
	
	
		
 
				break;

			




	
	
	
		
 

			




	
	
	
		
 
				if (this->avail_pos >= 0) this->vscroll2->ScrollTowards(this->avail_pos);

			




	
	
	
		
 
			case GOID_NEWGRF_CHANGES_APPLIED:

			




	
	
	
		
 
				/* No changes have been made to the list of active NewGRFs since the last time the changes got applied */

			




	
	
	
		
 
				this->modified = false;

			




	
	
	
		
 
				break;

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		this->BuildAvailables();

			




	
	
	
		
 

			




	
	
	
		
 
		this->SetWidgetDisabledState(WID_NS_APPLY_CHANGES, !this->editable || !this->modified);

			




	
	
	
		
 
		this->SetWidgetsDisabledState(!this->editable,

			




	
	
	
		
 
			WID_NS_PRESET_LIST,

			




	
	
	
		
 
			WID_NS_APPLY_CHANGES,

			




	
	
	
		
 
			WID_NS_TOGGLE_PALETTE,

			




	
	
	
		
 
			WIDGET_LIST_END

			




	
	
	
		
 
		);

			




	
	
		
 
@@ -1973,6 +1998,7 @@ static void NewGRFConfirmationCallback(W

			




	
	
	
		
 
		for (c = nw->actives; c != nullptr && i > 0; c = c->next, i--) {}

			




	
	
	
		
 
		nw->active_sel = c;

			




	
	
	
		
 
		nw->avails.ForceRebuild();

			




	
	
	
		
 
		nw->modified = false;

			




	
	
	
		
 

			




	
	
	
		
 
		w->InvalidateData();

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/window_type.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -703,9 +703,11 @@ enum WindowClass {

			




	
	
	
		
 
/** Data value for #Window::OnInvalidateData() of windows with class #WC_GAME_OPTIONS. */

			




	
	
	
		
 
enum GameOptionsInvalidationData {

			




	
	
	
		
 
	GOID_DEFAULT = 0,

			




	
	
	
		
 
	GOID_NEWGRF_RESCANNED,     ///< NewGRFs were just rescanned.

			




	
	
	
		
 
	GOID_NEWGRF_LIST_EDITED,   ///< List of active NewGRFs is being edited.

			




	
	
	
		
 
	GOID_NEWGRF_PRESET_LOADED, ///< A NewGRF preset was picked.

			




	
	
	
		
 
	GOID_NEWGRF_RESCANNED,       ///< NewGRFs were just rescanned.

			




	
	
	
		
 
	GOID_NEWGRF_CURRENT_LOADED,  ///< The current list of active NewGRF has been loaded.

			




	
	
	
		
 
	GOID_NEWGRF_LIST_EDITED,     ///< List of active NewGRFs is being edited.

			




	
	
	
		
 
	GOID_NEWGRF_CHANGES_MADE,    ///< Changes have been made to a given NewGRF either through the palette or its parameters.

			




	
	
	
		
 
	GOID_NEWGRF_CHANGES_APPLIED, ///< The active NewGRF list changes have been applied.

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
struct Window;

			




        

    



    


    



    



      

      





    
    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