Changeset - r20689:8d1555d9e2e3
Parent rev.
Child rev.
[Not reviewed]
master
0 2 0
frosch - 11 years ago 2013-08-18 15:32:45
frosch@openttd.org
(svn r25727) -Fix [FS#5686]: NWidgetMatrix used pip_pre and pip_post inconsistently and incorrectly, causing misalignment for RTL. (spotted by sbr)
2 files changed with 21 insertions and 20 deletions:
src/widget.cpp
19
18
src/widget_type.h
2
2
0 comments (0 inline, 0 general)
src/widget.cpp
➞
Show inline comments
 
@@ -1579,24 +1579,25 @@ NWidgetCore *NWidgetMatrix::GetWidgetFro
 
	int start_x, start_y, base_offs_x, base_offs_y;
 
	this->GetScrollOffsets(start_x, start_y, base_offs_x, base_offs_y);
 

			




	
	
	
		
 
	/* Swap the x offset around for RTL, so it'll behave like LTR for RTL as well. */

			




	
	
	
		
 
	bool rtl = _current_text_dir == TD_RTL;

			




	
	
	
		
 
	if (rtl) base_offs_x -= (this->widgets_x - 1) * this->widget_w;

			




	
	
	
		
 

			




	
	
	
		
 
	int widget_col = (x - base_offs_x - (int)this->pip_pre - (int)this->pos_x) / this->widget_w;

			




	
	
	
		
 
	int widget_col = (rtl ?

			




	
	
	
		
 
				-x + (int)this->pip_post + (int)this->pos_x + base_offs_x + (int)this->widget_w - 1 - (int)this->pip_inter :

			




	
	
	
		
 
				 x - (int)this->pip_pre  - (int)this->pos_x - base_offs_x

			




	
	
	
		
 
			) / this->widget_w;

			




	
	
	
		
 

			




	
	
	
		
 
	int widget_row = (y - base_offs_y - (int)this->pip_pre - (int)this->pos_y) / this->widget_h;

			




	
	
	
		
 

			




	
	
	
		
 
	if (widget_row * this->widgets_x + widget_col >= this->count) return NULL;

			




	
	
	
		
 
	int sub_wid = (widget_row + start_y) * this->widgets_x + start_x + widget_col;

			




	
	
	
		
 
	if (sub_wid >= this->count) return NULL;

			




	
	
	
		
 

			




	
	
	
		
 
	NWidgetCore *child = dynamic_cast<NWidgetCore *>(this->head);

			




	
	
	
		
 
	child->AssignSizePosition(ST_RESIZE,

			




	
	
	
		
 
			this->pos_x + this->pip_pre + widget_col * this->widget_w + base_offs_x,

			




	
	
	
		
 
			this->pos_x + (rtl ? this->pip_post - widget_col * this->widget_w : this->pip_pre + widget_col * this->widget_w) + base_offs_x,

			




	
	
	
		
 
			this->pos_y + this->pip_pre + widget_row * this->widget_h + base_offs_y,

			




	
	
	
		
 
			child->smallest_x, child->smallest_y, rtl);

			




	
	
	
		
 

			




	
	
	
		
 
	/* "Undo" the RTL swap here to get the right widget index. */

			




	
	
	
		
 
	if (rtl) widget_col = this->widgets_x - widget_col - 1;

			




	
	
	
		
 
	SB(child->index, 16, 16, (widget_row + start_y) * this->widgets_x + widget_col + start_x);

			




	
	
	
		
 
	SB(child->index, 16, 16, sub_wid);

			




	
	
	
		
 

			




	
	
	
		
 
	return child->GetWidgetFromPos(x, y);

			




	
	
	
		
 
}

			




	
	
		
 
@@ -1607,14 +1608,14 @@ NWidgetCore *NWidgetMatrix::GetWidgetFro

			




	
	
	
		
 
	GfxFillRect(this->pos_x, this->pos_y, this->pos_x + this->current_x - 1, this->pos_y + this->current_y - 1, _colour_gradient[this->colour & 0xF][5]);

			




	
	
	
		
 

			




	
	
	
		
 
	/* Set up a clipping area for the previews. */

			




	
	
	
		
 
	bool rtl = _current_text_dir == TD_RTL;

			




	
	
	
		
 
	DrawPixelInfo tmp_dpi;

			




	
	
	
		
 
	if (!FillDrawPixelInfo(&tmp_dpi, this->pos_x + this->pip_pre, this->pos_y + this->pip_pre, this->current_x - this->pip_pre - this->pip_post, this->current_y - this->pip_pre - this->pip_post)) return;

			




	
	
	
		
 
	if (!FillDrawPixelInfo(&tmp_dpi, this->pos_x + (rtl ? this->pip_post : this->pip_pre), this->pos_y + this->pip_pre, this->current_x - this->pip_pre - this->pip_post, this->current_y - this->pip_pre - this->pip_post)) return;

			




	
	
	
		
 
	DrawPixelInfo *old_dpi = _cur_dpi;

			




	
	
	
		
 
	_cur_dpi = &tmp_dpi;

			




	
	
	
		
 

			




	
	
	
		
 
	/* Get the appropriate offsets so we can draw the right widgets. */

			




	
	
	
		
 
	NWidgetCore *child = dynamic_cast<NWidgetCore *>(this->head);

			




	
	
	
		
 
	bool rtl = _current_text_dir == TD_RTL;

			




	
	
	
		
 
	int start_x, start_y, base_offs_x, base_offs_y;

			




	
	
	
		
 
	this->GetScrollOffsets(start_x, start_y, base_offs_x, base_offs_y);

			




	
	
	
		
 

			




	
	
		
 
@@ -1650,28 +1651,28 @@ NWidgetCore *NWidgetMatrix::GetWidgetFro

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * Get the different offsets that are influenced by scrolling.

			




	
	
	
		
 
 * @param [out] start_x     The start position in columns,

			




	
	
	
		
 
 * @param [out] start_x     The start position in columns (index of the left-most column, swapped in RTL).

			




	
	
	
		
 
 * @param [out] start_y     The start position in rows.

			




	
	
	
		
 
 * @param [out] base_offs_x The base horizontal offset in pixels.

			




	
	
	
		
 
 * @param [out] base_offs_y The base vertical offset in pixels.

			




	
	
	
		
 
 * @param [out] base_offs_x The base horizontal offset in pixels (X position of the column \a start_x).

			




	
	
	
		
 
 * @param [out] base_offs_y The base vertical offset in pixels (Y position of the column \a start_y).

			




	
	
	
		
 
 */

			




	
	
	
		
 
void NWidgetMatrix::GetScrollOffsets(int &start_x, int &start_y, int &base_offs_x, int &base_offs_y)

			




	
	
	
		
 
{

			




	
	
	
		
 
	base_offs_x = 0;

			




	
	
	
		
 
	base_offs_x = _current_text_dir == TD_RTL ? this->widget_w * (this->widgets_x - 1) : 0;

			




	
	
	
		
 
	base_offs_y = 0;

			




	
	
	
		
 
	start_x = 0;

			




	
	
	
		
 
	start_y = 0;

			




	
	
	
		
 
	if (this->sb != NULL) {

			




	
	
	
		
 
		if (this->sb->IsVertical()) {

			




	
	
	
		
 
			start_y = this->sb->GetPosition() / this->widget_h;

			




	
	
	
		
 
			base_offs_y = -this->sb->GetPosition() + start_y * this->widget_h;

			




	
	
	
		
 
			if (_current_text_dir == TD_RTL) base_offs_x = this->pip_pre + this->widget_w * (this->widgets_x - 1) - this->pip_inter;

			




	
	
	
		
 
			base_offs_y += -this->sb->GetPosition() + start_y * this->widget_h;

			




	
	
	
		
 
		} else {

			




	
	
	
		
 
			start_x = this->sb->GetPosition() / this->widget_w;

			




	
	
	
		
 
			int sub_x = this->sb->GetPosition() - start_x * this->widget_w;

			




	
	
	
		
 
			if (_current_text_dir == TD_RTL) {

			




	
	
	
		
 
				base_offs_x = this->sb->GetCapacity() + this->sb->GetPosition() - (start_x + 1) * this->widget_w + this->pip_inter - this->pip_post - this->pip_pre;

			




	
	
	
		
 
				base_offs_x += sub_x;

			




	
	
	
		
 
			} else {

			




	
	
	
		
 
				base_offs_x = -this->sb->GetPosition() + start_x * this->widget_w;

			




	
	
	
		
 
				base_offs_x -= sub_x;

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




        

    


    
    

    

        

                

                    src/widget_type.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -181,9 +181,9 @@ public:

			




	
	
	
		
 
	NWidgetBase *prev;    ///< Pointer to previous widget in container. Managed by parent container widget.

			




	
	
	
		
 

			




	
	
	
		
 
	uint8 padding_top;    ///< Paddings added to the top of the widget. Managed by parent container widget.

			




	
	
	
		
 
	uint8 padding_right;  ///< Paddings added to the right of the widget. Managed by parent container widget.

			




	
	
	
		
 
	uint8 padding_right;  ///< Paddings added to the right of the widget. Managed by parent container widget. (parent container may swap this with padding_left for RTL)

			




	
	
	
		
 
	uint8 padding_bottom; ///< Paddings added to the bottom of the widget. Managed by parent container widget.

			




	
	
	
		
 
	uint8 padding_left;   ///< Paddings added to the left of the widget. Managed by parent container widget.

			




	
	
	
		
 
	uint8 padding_left;   ///< Paddings added to the left of the widget. Managed by parent container widget. (parent container may swap this with padding_right for RTL)

			




	
	
	
		
 

			




	
	
	
		
 
protected:

			




	
	
	
		
 
	inline void StoreSizePosition(SizingType sizing, uint x, uint y, uint given_width, uint given_height);

			




        

    



    


    



    



      

      





    
    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