From 4013eb0e0b952f0de9f603e56d4886b6ed1059b0 Mon Sep 17 00:00:00 2001 From: thrust26 Date: Sun, 5 Aug 2018 22:58:35 +0200 Subject: [PATCH] fixed ComboDialog --- docs/graphics/eventmapping_combo.png | Bin 2655 -> 3840 bytes src/gui/ComboDialog.cxx | 5 ++--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/graphics/eventmapping_combo.png b/docs/graphics/eventmapping_combo.png index 96eac8f6d73a7fba912d14d0d6a318b08b71dd09..5f4be9f43b151316d9499eb087c867ee5a2dd275 100644 GIT binary patch literal 3840 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 literal 2655 zcmaJ@2~-nV77Z?dG&YOnl92|CgA}6!gSd-9ngm1yEwP7v3yncrHi^*y0n}DQ!GJh| zsF>Jcnq^$l2#N#{TA|TKx7Qr=7P{`B?In@4=-@Ke)drb^)Ahz+&}O)~&`8t7=W12KKS5?e^bVg`63H-^ zxU^O^ZdnJCIxJUrx=yd|9OJJxuS+~!4^m_n-J9hU6%i2@$s#!&4hvz0eQSR704vh3p!tc2Wdm6cR;GsWpq>(ls* z!dGUGo;HYN;zc9dQiSk^AY|v%^>8Z+{H)jRrg5^f>Rvza_k1 zg931tCNHQ%ddp)>Ru5=PhN{xyX469Ngswv^4`i7eTlzy$JN~(sIYKzl8ohRfYt6mS zdFCU(q$`RZ-8`<{6YG3;T}KHA~Bl3NyOId0}x>ZYh z_Js+bM{MQ8##eiye#_sQ|NeQEs4!Y-Sa<16b6&TOiD%cJQIV3fAC*3QQ6*j@ zx!X3zXIu(JEts(@Gu%-jNt(m>6?T?*$`^FX3;NERdJez4xSG%H9>`(5A@_J4FWRi} zH@?wbf>kkZ`3VZV<3`K-FniW7wsaA9bghFS7?#lAt#v>kx*^>_KsT~aSVBkU0ZMG0 zAl1^pJi%&<%BmC*QD&72KBZ;>tx0LOrb@F0^(ZCr3t%)EMk(f~P?rbzWDD>fZsb_v zuH5^l@^UzM`N+!@3XdU{$oLrtaI*FAuso#{P(kGb;LW?yg+xa*h4LyE{R# zvJA$v=&W|qPnya}Wo%z`mV^nWBg)v_-k{!khYE}>_}R8jUV)W(l(uny*#=f@P*GJT z^o?sx0AiCn8vi)?Q>EP|O+t!9mM5|tpruNffMEca1~AM5{fJvmU?eRnm?5x(t6hN! z`)OZnYN7y234ebc!f{T~k?o5Lg44}k)gJh+AC$5UfZ~;tGtU*V1@V>(iF&ei71+v+ zzF@k(TEP~$7IuFI@uN;D{`f|0%mph8$; z;A@2fmhtB?53lP@Mw6@hChB;EP8T*AJHNgR}ss*><=Ru4U;9$ae%S@Q0wF z8uTP>h|v=sdz8}5%UA)*umwQpp2`TEpa-l2TJZW<02Aj7f9Qqh%2>sYYzZ@Zw=HOk z)37+RH%BOu{Unj`GD2{&oLbPqRZcDgZPG9SWdGEgA0`b^K%DTf|gMs;$vZH9){IuI`dLttv4 zETJ{9cr8&#`)@INAKtIC=Ms;S4A1%Rp@xrCR@;P@pAcI+`v>`NI8s(L0E>fVo8EdA zf5Euk}eyAPNE~Mk0UvSa4RfMBP@NK3Lbd*ETIv6_hYNG*aibUag|OZKMKSHJ98bWeQmF~%XuPxf`opwz zMx){y&PL)oUCDKs_4|DtylS`A@l=iw{tu~#r7y*_YMW-tFY;tlS@U`1(B#r%x8b<= za=vu2ur2=jUMOf{srud6bt0F;xD$#Rm5KPB>K|2Bqw~VE;!(SdB%ZJY%gb9fS!grB zJ~wE!8L5Y`bOt6fuFFNb-f+;8^!Z!zy*b(kYTIS!>?9TjGC%$vWp9aP6f(27<62TNxb4^By%oYYP3km3410BKfV}+P-L!!y zPxnOy*4~c(5qTFjUO=8i{M!m8wNL-Bm`+0G8GaU$-@|c-Eo)S8-0Q71)1rhigBARS Vs*RS};BOy^instance(), boss->parent(), font, ""), + : Dialog(boss->instance(), boss->parent(), font, "Add..."), myComboEvent(Event::NoType) { const int lineHeight = font.getLineHeight(), @@ -38,7 +38,7 @@ ComboDialog::ComboDialog(GuiObject* boss, const GUI::Font& font, WidgetArray wid; // Set real dimensions - _w = 35 * fontWidth + 10; + _w = 33 * fontWidth + 10*2; _h = 10 * (lineHeight + 4) + 10 + _th; xpos = 10; ypos = 10 + _th; @@ -57,7 +57,6 @@ ComboDialog::ComboDialog(GuiObject* boss, const GUI::Font& font, ypos += lineHeight + 4; }; - xpos = 10; myEvents[0] = nullptr; ADD_EVENT_POPUP(0, "Event 1 "); myEvents[1] = nullptr; ADD_EVENT_POPUP(1, "Event 2 "); myEvents[2] = nullptr; ADD_EVENT_POPUP(2, "Event 3 ");