Ticket #11528: 0001-SettingsView-Layout-update-fixes-11528.patch

File 0001-SettingsView-Layout-update-fixes-11528.patch, 4.3 KB (added by MrPingouin, 9 years ago)

Layout update (sliders label commented out, insets more homogeneous)

  • src/preferences/mouse/SettingsView.cpp 

    From 6c52db8e0c9dd2d17db299bc06f67df097f311f7 Mon Sep 17 00:00:00 2001
From: Laurent Chea <contact@laurentchea.com>
Date: Sat, 6 Dec 2014 18:32:24 +0100
Subject: [PATCH] Layout update, insets are more homogeneous, sliders have no
 label anymore

---
 src/preferences/mouse/SettingsView.cpp | 50 ++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/preferences/mouse/SettingsView.cpp b/src/preferences/mouse/SettingsView.cpp
index ca9205d..f4c5dc3 100644
    a b SettingsView::SettingsView(MouseSettings& settings)  
    8383
    8484    BMenuField* typeField = new BMenuField(B_TRANSLATE("Mouse type:"),
    8585        fTypeMenu);
    86     typeField->SetAlignment(B_ALIGN_RIGHT);
     86    typeField->SetAlignment(B_ALIGN_LEFT);
    8787
    8888    // Create the "Double-click speed slider...
    8989    fClickSpeedSlider = new BSlider("double_click_speed",
    9090        B_TRANSLATE("Double-click speed"), new BMessage(kMsgDoubleClickSpeed),
    9191        0, 1000, B_HORIZONTAL);
    9292    fClickSpeedSlider->SetHashMarks(B_HASH_MARKS_BOTTOM);
    93     fClickSpeedSlider->SetHashMarkCount(5);
    94     fClickSpeedSlider->SetLimitLabels(B_TRANSLATE("Slow"),
    95         B_TRANSLATE("Fast"));
     93    fClickSpeedSlider->SetHashMarkCount(7);
    9694
    9795    // Create the "Mouse Speed" slider...
    9896    fMouseSpeedSlider = new BSlider("mouse_speed", B_TRANSLATE("Mouse speed"),
    9997        new BMessage(kMsgMouseSpeed), 0, 1000, B_HORIZONTAL);
    10098    fMouseSpeedSlider->SetHashMarks(B_HASH_MARKS_BOTTOM);
    10199    fMouseSpeedSlider->SetHashMarkCount(7);
    102     fMouseSpeedSlider->SetLimitLabels(B_TRANSLATE("Slow"),
    103         B_TRANSLATE("Fast"));
    104100
    105101    // Create the "Mouse Acceleration" slider...
    106102    fAccelerationSlider = new BSlider("mouse_acceleration",
    107103        B_TRANSLATE("Mouse acceleration"),
    108104        new BMessage(kMsgAccelerationFactor), 0, 1000, B_HORIZONTAL);
    109105    fAccelerationSlider->SetHashMarks(B_HASH_MARKS_BOTTOM);
    110     fAccelerationSlider->SetHashMarkCount(5);
    111     fAccelerationSlider->SetLimitLabels(B_TRANSLATE("Slow"),
    112         B_TRANSLATE("Fast"));
     106    fAccelerationSlider->SetHashMarkCount(7);
    113107
    114108    // Mouse image...
    115109    fMouseView = new MouseView(fSettings);
    … … SettingsView::SettingsView(MouseSettings& settings)  
    170164        new BMessage(kMsgAcceptFirstClick));
    171165
    172166    // dividers
     167    // This one is a vertical line for B_HORIZONTAL
    173168    BBox* hdivider = new BBox(
    174169        BRect(0, 0, 1, 1), B_EMPTY_STRING, B_FOLLOW_ALL_SIDES,
    175170            B_WILL_DRAW | B_FRAME_EVENTS, B_FANCY_BORDER);
    176171    hdivider->SetExplicitMaxSize(BSize(1, B_SIZE_UNLIMITED));
    177172
     173    // This one is a horizontal line for B_VERTICAL
    178174    BBox* vdivider = new BBox(
    179175        BRect(0, 0, 1, 1), B_EMPTY_STRING, B_FOLLOW_ALL_SIDES,
    180176            B_WILL_DRAW | B_FRAME_EVENTS, B_FANCY_BORDER);
    181177    vdivider->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, 1));
    182178
     179    int globalInset = 7;
     180
    183181    // Build the layout
    184     SetLayout(new BGroupLayout(B_HORIZONTAL));
     182    SetLayout(new BGroupLayout(B_VERTICAL));
     183
     184    // Layout is :
     185    // A | B
     186    // -----
     187    //   C
     188
     189    AddChild(BGroupLayoutBuilder(B_VERTICAL, globalInset)
     190
     191        // Horizontal : A|B
     192        .AddGroup(B_HORIZONTAL, globalInset)
    185193
    186     AddChild(BGroupLayoutBuilder(B_VERTICAL, 10)
    187         .AddGroup(B_HORIZONTAL, 10)
    188             .AddGroup(B_VERTICAL, 10, 1)
    189                 .AddGroup(B_HORIZONTAL, 10)
     194            // Vertical block A: mouse type/view/test
     195            .AddGroup(B_VERTICAL, 10)
     196                .AddGroup(B_HORIZONTAL, 0)
    190197                    .AddGlue()
    191198                    .Add(typeField)
    192199                    .AddGlue()
    193200                .End()
    194201                .AddGlue()
    195                 .Add(BGroupLayoutBuilder(B_HORIZONTAL, 10)
     202
     203                .Add(BGroupLayoutBuilder(B_HORIZONTAL, 0)
    196204                    .AddGlue()
    197205                    .Add(fMouseView)
    198206                    .AddGlue()
    … … SettingsView::SettingsView(MouseSettings& settings)  
    200208                .AddGlue()
    201209                .Add(doubleClickTextControl)
    202210            .End()
     211
    203212            .Add(hdivider)
    204             .AddGroup(B_VERTICAL, 5, 3)
     213
     214            // Vertical block B: speed settings
     215            .AddGroup(B_VERTICAL, B_USE_DEFAULT_SPACING, 3)
    205216                .Add(BGroupLayoutBuilder(B_HORIZONTAL, 0)
    206217                    .Add(fClickSpeedSlider)
    207218                )
    … … SettingsView::SettingsView(MouseSettings& settings)  
    213224                )
    214225            .End()
    215226        .End()
     227       
    216228        .Add(vdivider)
    217         .AddGroup(B_HORIZONTAL, 10)
     229       
     230        // Horizontal Block C: focus mode
     231        .AddGroup(B_HORIZONTAL, globalInset)
    218232            .Add(focusField)
    219233            .AddGlue()
    220234            .AddGroup(B_VERTICAL, 0)
    221235                .Add(fAcceptFirstClickBox)
    222236            .End()
    223237        .End()
    224         .SetInsets(5, 5, 5, 5)
     238        .SetInsets(globalInset,globalInset,globalInset,globalInset)
    225239    );
    226240}
    227241