mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-12 05:36:59 -04:00
Fixed dropdown arrow display bug on Linux.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@395 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
+1
-1
@@ -115,7 +115,7 @@ bool Style::update(Context& ctx) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void Style::initDependencies(Context& ctx, const Dependency& dep) const {
|
void Style::initDependencies(Context& ctx, const Dependency& dep) const {
|
||||||
/// left .initDependencies(ctx,dep);
|
// left .initDependencies(ctx,dep);
|
||||||
// top .initDependencies(ctx,dep);
|
// top .initDependencies(ctx,dep);
|
||||||
// width .initDependencies(ctx,dep);
|
// width .initDependencies(ctx,dep);
|
||||||
// height .initDependencies(ctx,dep);
|
// height .initDependencies(ctx,dep);
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ void NativeLookEditor::resizeViewers() {
|
|||||||
y += s->height + vspace;
|
y += s->height + vspace;
|
||||||
}
|
}
|
||||||
SetVirtualSize(w, (int)y);
|
SetVirtualSize(w, (int)y);
|
||||||
SetScrollbar(wxVERTICAL, 0, h, (int) y);
|
SetScrollbar(wxVERTICAL, 0, h, (int)y);
|
||||||
if (y >= h) {
|
if (y >= h) {
|
||||||
// Doesn't fit vertically, add scrollbar and resize
|
// Doesn't fit vertically, add scrollbar and resize
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -194,6 +194,9 @@ void draw_menu_arrow(Window* win, DC& dc, const wxRect& rect, bool active) {
|
|||||||
void draw_drop_down_arrow(Window* win, DC& dc, const wxRect& rect, bool active) {
|
void draw_drop_down_arrow(Window* win, DC& dc, const wxRect& rect, bool active) {
|
||||||
wxRendererNative& rn = wxRendererNative::GetDefault();
|
wxRendererNative& rn = wxRendererNative::GetDefault();
|
||||||
int w = wxSystemSettings::GetMetric(wxSYS_VSCROLL_ARROW_X); // drop down arrow is same size
|
int w = wxSystemSettings::GetMetric(wxSYS_VSCROLL_ARROW_X); // drop down arrow is same size
|
||||||
|
if (w == -1) {
|
||||||
|
w = wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); // Try just the scrollbar, then.
|
||||||
|
}
|
||||||
rn.DrawComboBoxDropButton(win, dc,
|
rn.DrawComboBoxDropButton(win, dc,
|
||||||
wxRect(rect.x + rect.width - w, rect.y, w, rect.height)
|
wxRect(rect.x + rect.width - w, rect.y, w, rect.height)
|
||||||
, active ? wxCONTROL_PRESSED : 0);
|
, active ? wxCONTROL_PRESSED : 0);
|
||||||
|
|||||||
Reference in New Issue
Block a user