Skip to content

Linux UX Improvements #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
justinfrankel merged 9 commits into from
Sep 9, 2021
Merged

Linux UX Improvements #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0548d44
swell: draw border around listview and treeview
gurrgur May 5, 2021
aff9fc4
swell: remove vertical separator line in submenus
gurrgur May 5, 2021
92d559c
swell submenu: adjust horizontal spacing
gurrgur May 5, 2021
e92c6f8
swell submenu: redesign check symbol
gurrgur May 5, 2021
7a15c00
swell submenu: adjust arrow size and position
gurrgur May 5, 2021
4cc2e68
swell submenu: full width selection background
gurrgur May 5, 2021
da3daab
swell menubar: add margin to selected item background
gurrgur May 5, 2021
91bf5f3
swell: remove (sub-)submenu overlap
gurrgur May 5, 2021
e1b3c7d
swell: remove overlap when submenu is placed on the left
gurrgur May 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions WDL/swell/swell-internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,7 +1227,8 @@ static void __listview_mergesort_internal(void *base, size_t nmemb, size_t size,
fd(menu_text_sel, RGB(224,224,224), menu_bg) \
f(menu_scroll, RGB(64,64,64)) \
fd(menu_scroll_arrow, RGB(96,96,96), _3dshadow) \
fd(menu_submenu_arrow, RGB(96,96,96), _3dshadow) \
fd(menu_submenu_arrow, RGB(96,96,96), menu_text) \
fd(menu_submenu_arrow_sel, RGB(96,96,96), menu_bg) \
fd(menubar_bg, RGB(192,192,192), menu_bg) \
fd(menubar_text, RGB(0,0,0), menu_text) \
fd(menubar_text_disabled, RGB(224,224,224), menu_text_disabled) \
Expand All @@ -1253,6 +1254,8 @@ static void __listview_mergesort_internal(void *base, size_t nmemb, size_t size,
fd(listview_text_sel, RGB(0,0,0), listview_text) \
fd(listview_grid, RGB(224,224,224), _3dhilight) \
f(listview_hdr_arrow,RGB(96,96,96)) \
fd(listview_shadow, RGB(96,96,96), _3dshadow) \
fd(listview_hilight, RGB(224,224,224), _3dhilight) \
fd(listview_hdr_shadow, RGB(96,96,96), _3dshadow) \
fd(listview_hdr_hilight, RGB(224,224,224), _3dhilight) \
fd(listview_hdr_bg, RGB(192,192,192), _3dface) \
Expand All @@ -1262,6 +1265,8 @@ static void __listview_mergesort_internal(void *base, size_t nmemb, size_t size,
f(treeview_bg_sel, RGB(128,128,255)) \
f(treeview_text_sel, RGB(0,0,0)) \
f(treeview_arrow, RGB(96,96,96)) \
fd(treeview_shadow, RGB(96,96,96), _3dshadow) \
fd(treeview_hilight, RGB(224,224,224), _3dhilight) \
fd(tab_shadow, RGB(96,96,96), _3dshadow) \
fd(tab_hilight, RGB(224,224,224), _3dhilight) \
fd(tab_text, RGB(0,0,0), button_text) \
Expand All @@ -1270,9 +1275,9 @@ static void __listview_mergesort_internal(void *base, size_t nmemb, size_t size,
fd(group_shadow, RGB(96,96,96), _3dshadow) \
fd(group_hilight, RGB(224,224,224), _3dhilight) \
f(focus_hilight, RGB(140,190,233)) \




struct swell_colortheme {
#define __def_theme_ent(x,c) int x;
#define __def_theme_ent_fb(x,c,fb) int x;
Expand Down
53 changes: 31 additions & 22 deletions WDL/swell/swell-menu-generic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ static LRESULT WINAPI submenuWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM
static int lcol, rcol, mcol, top_margin, separator_ht, text_ht_pad, bitmap_ht_pad, scroll_margin, item_bm_pad;
if (!lcol)
{
lcol=SWELL_UI_SCALE(24); rcol=SWELL_UI_SCALE(12); mcol=SWELL_UI_SCALE(10);
lcol=SWELL_UI_SCALE(30); rcol=SWELL_UI_SCALE(18); mcol=SWELL_UI_SCALE(10);
top_margin=SWELL_UI_SCALE(4); separator_ht=SWELL_UI_SCALE(8);
text_ht_pad=SWELL_UI_SCALE(4); bitmap_ht_pad=SWELL_UI_SCALE(4);
scroll_margin=SWELL_UI_SCALE(10);
Expand Down Expand Up @@ -529,12 +529,13 @@ static LRESULT WINAPI submenuWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM
{
RECT cr;
GetClientRect(hwnd,&cr);
HBRUSH br=CreateSolidBrush(g_swell_ctheme.menu_bg);
HBRUSH br = CreateSolidBrush(g_swell_ctheme.menu_bg);
HBRUSH br2 = CreateSolidBrushAlpha(g_swell_ctheme.menu_scroll,0.5f);
HBRUSH br3 = CreateSolidBrush(g_swell_ctheme.menu_scroll_arrow);
HBRUSH br_submenu_arrow = CreateSolidBrush(g_swell_ctheme.menu_submenu_arrow);
HPEN pen=CreatePen(PS_SOLID,0,g_swell_ctheme.menu_shadow);
HPEN pen2=CreatePen(PS_SOLID,0,g_swell_ctheme.menu_hilight);
HBRUSH br_submenu_arrow_sel = CreateSolidBrush(g_swell_ctheme.menu_submenu_arrow_sel);
HPEN pen = CreatePen(PS_SOLID,0,g_swell_ctheme.menu_shadow);
HPEN pen2 = CreatePen(PS_SOLID,0,g_swell_ctheme.menu_hilight);
HGDIOBJ oldbr = SelectObject(ps.hdc,br);
HGDIOBJ oldpen = SelectObject(ps.hdc,pen2);
Rectangle(ps.hdc,cr.left,cr.top,cr.right,cr.bottom);
Expand All @@ -543,12 +544,6 @@ static LRESULT WINAPI submenuWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM
int x;
int ypos = top_margin;

MoveToEx(ps.hdc,cr.left+lcol-SWELL_UI_SCALE(4),cr.top,NULL);
LineTo(ps.hdc,cr.left+lcol-SWELL_UI_SCALE(4),cr.bottom);
SelectObject(ps.hdc,pen);
MoveToEx(ps.hdc,cr.left+lcol-SWELL_UI_SCALE(5),cr.top,NULL);
LineTo(ps.hdc,cr.left+lcol-SWELL_UI_SCALE(5),cr.bottom);

hwnd->m_extra[1]=0;
for (x=wdl_max(hwnd->m_extra[0],0); x < (menu->items.GetSize()); x++)
{
Expand Down Expand Up @@ -593,6 +588,7 @@ static LRESULT WINAPI submenuWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM
{
HBRUSH brs=CreateSolidBrush(g_swell_ctheme.menu_bg_sel);
RECT r2=r;
r2.left = cr.left;
FillRect(ps.hdc,&r2,brs);
DeleteObject(brs);
SetTextColor(ps.hdc,g_swell_ctheme.menu_text_sel);
Expand Down Expand Up @@ -643,53 +639,66 @@ static LRESULT WINAPI submenuWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM
else
{
SelectObject(ps.hdc,pen2);
int y = r.top/2+r.bottom/2, right = r.right-rcol*3/2;
MoveToEx(ps.hdc,r.left,y,NULL);
int margin = rcol / 2;
int y = r.top/2+r.bottom/2, left = cr.left+margin, right = r.right-margin;
MoveToEx(ps.hdc,left,y,NULL);
LineTo(ps.hdc,right,y);
SelectObject(ps.hdc,pen);

y++;
MoveToEx(ps.hdc,r.left,y,NULL);
MoveToEx(ps.hdc,left,y,NULL);
LineTo(ps.hdc,right,y);
}
if (inf->hSubMenu)
{
const int sz = (r.bottom-r.top)/4, xp = r.right - sz*2, yp = (r.top + r.bottom)/2;
const int sz = (r.bottom-r.top)/5, xp = r.right - rcol/2 - sz, yp = (r.top + r.bottom)/2;

POINT pts[3] = {
{xp, yp-sz},
{xp, yp+sz},
{xp + sz,yp}
};
HGDIOBJ oldPen = SelectObject(ps.hdc,GetStockObject(NULL_PEN));
SelectObject(ps.hdc,br_submenu_arrow);

if (x == menu->sel_vis && !dis)
SelectObject(ps.hdc,br_submenu_arrow_sel);
else
SelectObject(ps.hdc,br_submenu_arrow);

Polygon(ps.hdc,pts,3);

SelectObject(ps.hdc,oldPen);


}
if (inf->fState&MF_CHECKED)
{
const int col = dis ? g_swell_ctheme.menu_text_disabled : g_swell_ctheme.menu_text;
int col;
if (x == menu->sel_vis && !dis)
col = g_swell_ctheme.menu_text_sel;
else
col = dis ? g_swell_ctheme.menu_text_disabled : g_swell_ctheme.menu_text;

HPEN tpen = CreatePen(PS_SOLID,0, col);
HBRUSH tbr = CreateSolidBrush(col);
HGDIOBJ oldBrush = SelectObject(ps.hdc,tbr);
HGDIOBJ oldPen = SelectObject(ps.hdc,tpen);
const int sz = (wdl_min(lcol, r.bottom-r.top) - SWELL_UI_SCALE(6));
const int sz = (wdl_min(lcol, r.bottom-r.top) - SWELL_UI_SCALE(10));
const int xo = SWELL_UI_SCALE(4), yo = (r.bottom+r.top)/2 - sz/2;
if (inf->fType&MFT_RADIOCHECK)
{
Ellipse(ps.hdc, xo, yo, xo+sz, yo+sz);
}
else
{
static const unsigned char coords[12] = { 128, 30, 108, 11, 48, 72, 48, 112, 0, 65, 20, 46, };
static const unsigned char coords[12] = { 0, 76, 12, 64, 40, 92, 40, 118, 116, 16, 128, 28, };
for (int pass=0;pass<2;pass++)
{
POINT pts[4];
for (int i=0;i<4; i ++)
{
pts[i].x = xo + ((int)coords[i*2+pass*4] * sz + 63) / 128;
pts[i].y = yo + ((int)coords[i*2+pass*4+1] * sz + 63) / 128;
pts[i].x = lcol/2 + sz * ((int)coords[i*2+pass*4] - 64) / 128;
pts[i].y = (r.bottom+r.top)/2 + sz * ((int)coords[i*2+pass*4+1] - 64) / 128;
}
Polygon(ps.hdc,pts,4);
}
Expand Down Expand Up @@ -1070,9 +1079,9 @@ static LRESULT WINAPI submenuWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM

RECT r;
GetClientRect(hwnd,&r);
m_trackingPt.x=r.right - SWELL_UI_SCALE(3);
m_trackingPt.x=r.right;
m_trackingPt.y=item_ypos;
m_trackingPt2.x=r.left + lcol/4;
m_trackingPt2.x=r.left;
m_trackingPt2.y=item_ypos;
ClientToScreen(hwnd,&m_trackingPt);
ClientToScreen(hwnd,&m_trackingPt2);
Expand Down
15 changes: 13 additions & 2 deletions WDL/swell/swell-wnd-generic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4659,6 +4659,7 @@ static LRESULT listViewWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
{
RECT cr;
GetClientRect(hwnd,&cr);
RECT rr = cr;
HBRUSH bgbr = CreateSolidBrush(lvs->m_color_bg);
FillRect(ps.hdc,&cr,bgbr);
DeleteObject(bgbr);
Expand Down Expand Up @@ -4967,6 +4968,9 @@ static LRESULT listViewWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
totalw,lvs->m_scroll_x);
}
}
Draw3DBox(ps.hdc,&rr,-1,
g_swell_ctheme.listview_hilight,
g_swell_ctheme.listview_shadow);
DeleteObject(bgbr);

EndPaint(hwnd,&ps);
Expand Down Expand Up @@ -5656,6 +5660,9 @@ static LRESULT treeViewWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
DeleteObject(br);

drawVerticalScrollbar(ps.hdc,cr,total_h,tvs->m_scroll_y);
Draw3DBox(ps.hdc,&cr,-1,
g_swell_ctheme.treeview_hilight,
g_swell_ctheme.treeview_shadow);
}

EndPaint(hwnd,&ps);
Expand Down Expand Up @@ -7002,7 +7009,7 @@ static int menuBarHitTest(HWND hwnd, int mousex, int mousey, RECT *rOut, int for
{
HDC dc = GetWindowDC(hwnd);

int x,xpos=r.left + g_swell_ctheme.menubar_margin_width;
int x,xpos=r.left;
HMENU__ *menu = (HMENU__*)hwnd->m_menu;
HGDIOBJ oldfont = dc ? SelectObject(dc,menubar_font) : NULL;
const int n=menu->items.GetSize();
Expand Down Expand Up @@ -7199,8 +7206,12 @@ LRESULT DefWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
cr.bottom = r.bottom;
if (!dis && menu->sel_vis == x)
{
RECT crb = {0};
crb.left = cr.left, crb.right=cr.right, crb.top=cr.top, crb.bottom=cr.bottom;
crb.left = crb.left - g_swell_ctheme.menubar_margin_width;
crb.right = crb.right + g_swell_ctheme.menubar_margin_width;
HBRUSH br = CreateSolidBrush(g_swell_ctheme.menubar_bg_sel);
FillRect(dc,&cr,br);
FillRect(dc,&crb,br);
DeleteObject(br);
SetTextColor(dc,g_swell_ctheme.menubar_text_sel);
}
Expand Down