From f99cba9e576028f6369be502f3134d41ef5c5442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Fri, 7 Aug 2009 08:41:17 +0000 Subject: [PATCH] * The colors menu had "label from marked" activated, but then replaced its label, causing bug #4193. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32176 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/preferences/screen/ScreenWindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/preferences/screen/ScreenWindow.cpp b/src/preferences/screen/ScreenWindow.cpp index d9147d0bc9..e3056ef4c1 100644 --- a/src/preferences/screen/ScreenWindow.cpp +++ b/src/preferences/screen/ScreenWindow.cpp @@ -279,7 +279,7 @@ ScreenWindow::ScreenWindow(ScreenSettings* settings) fResolutionField = new BMenuField("ResolutionMenu", "Resolution:", fResolutionMenu, NULL); - fColorsMenu = new BPopUpMenu("colors", true, true); + fColorsMenu = new BPopUpMenu("colors", true, false); for (int32 i = 0; i < kColorSpaceCount; i++) { BMessage *message = new BMessage(POP_COLORS_MSG); @@ -1121,7 +1121,7 @@ ScreenWindow::_UpdateMonitor() length = snprintf(text, sizeof(text), "Horizonal Frequency:\t%lu - %lu kHz\n" "Vertical Frequency:\t%lu - %lu Hz\n\n" - "Maximum Pixel Clock:\t%g MHz", + "Maximum Pixel Clock:\t%g MHz", info.min_horizontal_frequency, info.max_horizontal_frequency, info.min_vertical_frequency, info.max_vertical_frequency, info.max_pixel_clock / 1000.0); @@ -1130,7 +1130,7 @@ ScreenWindow::_UpdateMonitor() length += snprintf(text + length, sizeof(text) - length, "%sSerial no.: %s", length ? "\n\n" : "", info.serial_number); - if (info.produced.week != 0 && info.produced.year != 0 + if (info.produced.week != 0 && info.produced.year != 0 && length < sizeof(text)) { length += snprintf(text + length, sizeof(text) - length, "(%u/%u)", info.produced.week, info.produced.year);