[haiku-commits] r36525 - haiku/trunk/src/preferences/datatranslations
- From: axeld@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 29 Apr 2010 10:37:12 +0200 (CEST)
Author: axeld
Date: 2010-04-29 10:37:12 +0200 (Thu, 29 Apr 2010)
New Revision: 36525
Changeset: http://dev.haiku-os.org/changeset/36525/haiku
Modified:
haiku/trunk/src/preferences/datatranslations/DataTranslationsSettings.cpp
haiku/trunk/src/preferences/datatranslations/DataTranslationsWindow.cpp
Log:
* The window is now centered on screen when opened for the first time.
* Simplified and cleaned up the "window not on screen" code.
* Enlarged the default window size a bit.
Modified:
haiku/trunk/src/preferences/datatranslations/DataTranslationsSettings.cpp
===================================================================
--- haiku/trunk/src/preferences/datatranslations/DataTranslationsSettings.cpp
2010-04-29 07:37:06 UTC (rev 36524)
+++ haiku/trunk/src/preferences/datatranslations/DataTranslationsSettings.cpp
2010-04-29 08:37:12 UTC (rev 36525)
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2006, Haiku, Inc.
+ * Copyright 2002-2010, Haiku, Inc.
* Distributed under the terms of the MIT license.
*
* Authors:
@@ -25,7 +25,7 @@
if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) != B_OK)
return;
- fCorner = BPoint(50, 50);
+ fCorner = BPoint(-1, -1);
path.Append("system/DataTranslations settings");
BFile file(path.Path(), B_READ_ONLY);
@@ -41,7 +41,7 @@
DataTranslationsSettings::~DataTranslationsSettings()
-{
+{
BPath path;
if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) < B_OK)
return;
Modified:
haiku/trunk/src/preferences/datatranslations/DataTranslationsWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/datatranslations/DataTranslationsWindow.cpp
2010-04-29 07:37:06 UTC (rev 36524)
+++ haiku/trunk/src/preferences/datatranslations/DataTranslationsWindow.cpp
2010-04-29 08:37:12 UTC (rev 36525)
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2009, Haiku, Inc.
+ * Copyright 2002-2010, Haiku, Inc.
* Distributed under the terms of the MIT license.
*
* Authors:
@@ -36,42 +36,26 @@
#include "XTab.h"
#include "YTab.h"
-#define DTW_RIGHT 400
-#define DTW_BOTTOM 300
-
const uint32 kMsgTranslatorInfo = 'trin';
const uint32 kMsgSelectedTranslator = 'trsl';
DataTranslationsWindow::DataTranslationsWindow()
- : BWindow(BRect(0, 0, DTW_RIGHT, DTW_BOTTOM),
- "DataTranslations", B_TITLED_WINDOW,
- B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_NOT_RESIZABLE |
B_AUTO_UPDATE_SIZE_LIMITS)
+ : BWindow(BRect(0, 0, 550, 350), "DataTranslations", B_TITLED_WINDOW,
+ B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_NOT_RESIZABLE
+ | B_AUTO_UPDATE_SIZE_LIMITS)
{
MoveTo(dynamic_cast<DataTranslationsApplication
*>(be_app)->WindowCorner());
+ _SetupViews();
+
// Make sure that the window isn't positioned off screen
BScreen screen;
- BRect scrf = screen.Frame(), winf = Frame();
- float x = winf.left, y = winf.top;
- scrf.top += 24;
- scrf.left += 5;
- scrf.right -= 5;
- if (winf.left < scrf.left)
- x = scrf.left;
- if (winf.right > scrf.right)
- x = scrf.right - winf.Width() - 5;
- if (winf.top < scrf.top)
- y = scrf.top;
- if (winf.bottom > scrf.bottom)
- y = scrf.bottom - winf.Height() - 15;
+ BRect screenFrame = screen.Frame();
+ if (!screenFrame.Contains(Frame()))
+ CenterOnScreen();
- if (x != winf.left || y != winf.top)
- MoveTo(x, y);
-
- _SetupViews();
-
BTranslatorRoster *roster = BTranslatorRoster::Default();
roster->StartWatching(this);
@@ -140,7 +124,7 @@
DataTranslationsWindow::_ShowConfigView(int32 id)
{
// Shows the config panel for the translator with the given id
-
+
if (id < 0)
return B_BAD_VALUE;
@@ -222,7 +206,7 @@
// Add the translator name view
fTranslatorNameView = new BStringView("TranName", "None");
- // Populate the translators list view
+ // Populate the translators list view
_PopulateListView();
// Build the layout
@@ -403,6 +387,6 @@
default:
BWindow::MessageReceived(message);
break;
- }
+ }
}
Other related posts:
- » [haiku-commits] r36525 - haiku/trunk/src/preferences/datatranslations - axeld
