View | Details | Raw Unified | Return to bug 8090
Collapse All | Expand All

(-)src/themable.h.orig (+4 lines)
Lines 16-21 Link Here
16 
XIV(bool, titleBarJoinRight,                    false)
 12 
XIV(bool, titleBarJoinRight,                    false)
17 
XIV(bool, showFrameIcon,                        true)
 13 
XIV(bool, showFrameIcon,                        true)
18 

          14
          

        

            

              
              
              15
              
XIV(bool, showButtonBorder,			true)

            

            

              16
              

            

        

          19
          
XIV(int, wsBorderX,                             6)

          17
          
XIV(int, wsBorderX,                             6)

        

        

          20
          
XIV(int, wsBorderY,                             6)

          18
          
XIV(int, wsBorderY,                             6)

        

        

          21
          
XIV(int, wsDlgBorderX,                          2)

          19
          
XIV(int, wsDlgBorderX,                          2)

        

  

    
      
            Lines 162-167
          
      
      
        Link Here
      
    
  

        

          162
          
    OBV("TitleBarJoinRight",                    &titleBarJoinRight,             "Join title*T and title*B"),

          160
          
    OBV("TitleBarJoinRight",                    &titleBarJoinRight,             "Join title*T and title*B"),

        

        

          163
          
    OBV("ShowMenuButtonIcon",                   &showFrameIcon,                 "Show application icon over menu button"),

          161
          
    OBV("ShowMenuButtonIcon",                   &showFrameIcon,                 "Show application icon over menu button"),

        

        

          164
          

          162
          

        

            

              
              
              163
              
    OBV("ShowButtonBorder",			&showButtonBorder,			"Show button border"),

            

            

              164
              

            

        

          165
          
    OIV("BorderSizeX",                          &wsBorderX, 0, 128,             "Horizontal window border"),

          165
          
    OIV("BorderSizeX",                          &wsBorderX, 0, 128,             "Horizontal window border"),

        

        

          166
          
    OIV("BorderSizeY",                          &wsBorderY, 0, 128,             "Vertical window border"),

          166
          
    OIV("BorderSizeY",                          &wsBorderY, 0, 128,             "Vertical window border"),

        

        

          167
          
    OIV("DlgBorderSizeX",                       &wsDlgBorderX, 0, 128,          "Horizontal dialog window border"),

          167
          
    OIV("DlgBorderSizeX",                       &wsDlgBorderX, 0, 128,          "Horizontal dialog window border"),

        



(-)src/ybutton.cc.orig
      (-3 / +7 lines)




  

    
      
            Lines 112-119
          
      
      
        Link Here
      
    
  

        

          112
          
        g.setColor(surface.color);

          112
          
        g.setColor(surface.color);

        

        

          113
          

          113
          

        

        

          114
          
        if (wmLook == lookMetal) {

          114
          
        if (wmLook == lookMetal) {

        

          
            

              115
              
            g.drawBorderM(x, y, w - 1, h - 1, !d);


              115
              
	    if (showButtonBorder) {

            

            

              116
              
            d = 0; x += 2; y += 2; w -= 4; h -= 4;


              116
              
        	g.drawBorderM(x, y, w - 1, h - 1, !d);

            

            

              
              

              117
              
        	d = 0; x += 2; y += 2; w -= 4; h -= 4;

            

            


              118
              
	    } else

            

            


              119
              
		d=0;

            

        

          117
          
        } else if (wmLook == lookGtk) {

          120
          
        } else if (wmLook == lookGtk) {

        

        

          118
          
            g.drawBorderG(x, y, w - 1, h - 1, !d);

          121
          
            g.drawBorderG(x, y, w - 1, h - 1, !d);

        

        

          119
          
            x += 1 + d; y += 1 + d; w -= 3; h -= 3;

          122
          
            x += 1 + d; y += 1 + d; w -= 3; h -= 3;

        

  

    
      
            Lines 123-129
          
      
      
        Link Here
      
    
  

        

          123
          
        }

          126
          
        }

        

        

          124
          

          127
          

        

        

          125
          
        paint(g, d, YRect(x, y, w, h));

          128
          
        paint(g, d, YRect(x, y, w, h));

        

          
            

              126
              
        paintFocus(g, YRect(x, y, w, h));


              129
              
	if (showButtonBorder)

            

            

              
              

              130
              
    	    paintFocus(g, YRect(x, y, w, h));

            

        

          127
          
    }

          131
          
    }

        

        

          128
          
}

          132
          
}

        

        

          129
          

          133
          

        






  

  Return to bug 8090