summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Ercolano <erco@seriss.com>2013-09-22 03:22:41 +0000
committerGreg Ercolano <erco@seriss.com>2013-09-22 03:22:41 +0000
commit81dfeab19e6a4881b809910cfe443f6beb446a3d (patch)
tree4a5b7c6421c7872c394b0a430e732ac3ef7c6e2e
parent5d4fed1ef92a7b13876c4c253f55952b9e279a07 (diff)
Fixed some odd/misleading code indent issues in this file.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9983 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--src/screen_xywh.cxx30
1 files changed, 14 insertions, 16 deletions
diff --git a/src/screen_xywh.cxx b/src/screen_xywh.cxx
index d02d62d76..248369542 100644
--- a/src/screen_xywh.cxx
+++ b/src/screen_xywh.cxx
@@ -135,10 +135,9 @@ static void screen_init() {
CGSize s = CGDisplayScreenSize(displays[i]); // from 10.3
dpi_h[i] = screens[i].width / (s.width/25.4);
dpi_v[i] = screens[i].height / (s.height/25.4);
- }
- else {
+ } else {
dpi_h[i] = dpi_v[i] = 75.;
- }
+ }
}
num_screens = count;
}
@@ -149,11 +148,11 @@ static void screen_init() {
# include <X11/extensions/Xinerama.h>
#endif
typedef struct {
- short x_org;
- short y_org;
- short width;
- short height;
- } FLScreenInfo;
+ short x_org;
+ short y_org;
+ short width;
+ short height;
+} FLScreenInfo;
static FLScreenInfo screens[MAX_SCREENS];
static float dpi[MAX_SCREENS][2];
@@ -258,10 +257,9 @@ void Fl::screen_work_area(int &X, int &Y, int &W, int &H, int n) {
Y = Fl::y();
W = Fl::w();
H = Fl::h();
- }
- else { // for other screens, work area is full screen,
+ } else { // for other screens, work area is full screen,
screen_xywh(X, Y, W, H, n);
- }
+ }
#endif
}
@@ -292,10 +290,10 @@ void Fl::screen_xywh(int &X, int &Y, int &W, int &H, int n) {
H = GetSystemMetrics(SM_CYSCREEN);
}
#elif defined(__APPLE__)
- X = screens[n].x;
- Y = screens[n].y;
- W = screens[n].width;
- H = screens[n].height;
+ X = screens[n].x;
+ Y = screens[n].y;
+ W = screens[n].width;
+ H = screens[n].height;
#else
if (num_screens > 0) {
X = screens[n].x_org;
@@ -340,7 +338,7 @@ int Fl::screen_num(int x, int y) {
// Return the number of pixels common to the two rectangular areas
static inline float fl_intersection(int x1, int y1, int w1, int h1,
- int x2, int y2, int w2, int h2) {
+ int x2, int y2, int w2, int h2) {
if(x1+w1 < x2 || x2+w2 < x1 || y1+h1 < y2 || y2+h2 < y1)
return 0.;
int int_left = x1 > x2 ? x1 : x2;