Ticket #13673: 0002-BTabView-remove-dead-code.patch

File 0002-BTabView-remove-dead-code.patch, 1.5 KB (added by KapiX, 7 years ago)
  • src/kits/interface/TabView.cpp

    From 29e5a0653f3c4adb8bfb02e963adb72e084a0bdc Mon Sep 17 00:00:00 2001
    From: Kacper Kasper <kacperkasper@gmail.com>
    Date: Sat, 19 Aug 2017 15:41:35 +0200
    Subject: [PATCH 2/3] BTabView: remove dead code.
    
    ---
     src/kits/interface/TabView.cpp | 33 ---------------------------------
     1 file changed, 33 deletions(-)
    
    diff --git a/src/kits/interface/TabView.cpp b/src/kits/interface/TabView.cpp
    index 030649d..1d589b1 100644
    a b BTabView::TabFrame(int32 index) const  
    904904            return BRect(offset + index * width, 0.0f,
    905905                offset + index * width + width, height);
    906906    }
    907 
    908     // TODO: fix to remove "offset" in DrawTab and DrawLabel ...
    909     switch (fTabWidthSetting) {
    910         case B_WIDTH_FROM_LABEL:
    911         {
    912             float x = 6.0f;
    913             for (int32 i = 0; i < index; i++){
    914                 x += StringWidth(TabAt(i)->Label()) + 20.0f;
    915             }
    916 
    917             return BRect(x - fTabOffset, 0.0f,
    918                 x - fTabOffset + StringWidth(TabAt(index)->Label()) + 20.0f,
    919                 fTabHeight);
    920         }
    921 
    922         case B_WIDTH_FROM_WIDEST:
    923         {
    924             float width = 0.0f;
    925 
    926             for (int32 i = 0; i < CountTabs(); i++) {
    927                 float tabWidth = StringWidth(TabAt(i)->Label()) + 20.0f;
    928                 if (tabWidth > width)
    929                     width = tabWidth;
    930             }
    931             return BRect((6.0f + index * width) - fTabOffset, 0.0f,
    932                 (6.0f + index * width + width) - fTabOffset, fTabHeight);
    933         }
    934 
    935         case B_WIDTH_AS_USUAL:
    936         default:
    937             return BRect((6.0f + index * 100.0f) - fTabOffset, 0.0f,
    938                 (6.0f + index * 100.0f + 100.0f) - fTabOffset, fTabHeight);
    939     }
    940907}
    941908
    942909