# HG changeset patch # User DrinkMachine # Date 1366499037 14400 # Node ID f52c6f9800ca590be53565fb1046b35f0be168c4 # Parent 2dfe7c57667c603be6f16be1dff17f15245dbb21 Hiding overflow on Labels/ComboBoxes to prevent 1px off by one error diff -r 2dfe7c57667c -r f52c6f9800ca .hgignore --- a/.hgignore Fri Apr 19 16:30:39 2013 -0400 +++ b/.hgignore Sat Apr 20 19:03:57 2013 -0400 @@ -54,8 +54,8 @@ glob:project_files/Android-build/SDL-android-project/.* glob:project_files/Android-build/out glob:project_files/Android-build/Makefile.android -glob:hedgewars-build-desktop-Qt_4_7_4_for_Desktop_-_MinGW_4_4__Qt_SDK__Debug -glob:hedgewars-build-desktop-Qt_4_7_4_for_Desktop_-_MinGW_4_4__Qt_SDK__Release +glob:hedgewars-build-desktop-Qt* +glob:hedgewars-build-desktop-Qt* glob:*.depends glob:tools/build_windows_koda.bat glob:share/hedgewars/Data/misc/hwengine.desktop diff -r 2dfe7c57667c -r f52c6f9800ca QTfrontend/res/css/qt.css --- a/QTfrontend/res/css/qt.css Fri Apr 19 16:30:39 2013 -0400 +++ b/QTfrontend/res/css/qt.css Sat Apr 20 19:03:57 2013 -0400 @@ -176,9 +176,15 @@ height: 10px; } +QLabel { +overflow: hidden; +} + QComboBox { border-radius: 10px; padding: 3px; +height: 18px; +overflow: hidden; } QComboBox:pressed{ border-color: white; @@ -326,4 +332,4 @@ TeamSelWidget, #gameStackContainer, #GBoxOptions { border-radius: 10px; -} \ No newline at end of file +}